Skip to content

Commit

Permalink
Merge pull request #173 from stdweird/no_cleanup_on_skip_build
Browse files Browse the repository at this point in the history
(try to) detect --skip-build, and do not cleanup the previous build
  • Loading branch information
boegel committed May 11, 2015
2 parents 89061e5 + b8602d6 commit 8743b73
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 2 deletions.
15 changes: 14 additions & 1 deletion lib/vsc/install/shared_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,20 @@ def build_setup_cfg_for_bdist_rpm(target):
def action_target(target, setupfn=setup, extra_sdist=[]):
# EXTRA_SDIST_FILES.extend(extra_sdist)

cleanup()
do_cleanup = True
try:
# very primitive check for install --skip-build
# in that case, we don't mind "leftover build";
# it's probably intentional
install_ind = sys.argv.index('install')
build_skip = sys.argv.index('--skip-build')
if build_skip > install_ind:
do_cleanup = False
except ValueError:
pass

if do_cleanup:
cleanup()

build_setup_cfg_for_bdist_rpm(target)
x = parse_target(target)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def remove_bdist_rpm_source_file():

PACKAGE = {
'name': 'vsc-base',
'version': '2.2.0',
'version': '2.2.1',
'author': [sdw, jt, ag, kh],
'maintainer': [sdw, jt, ag, kh],
'packages': ['vsc', 'vsc.utils', 'vsc.install'],
Expand Down

0 comments on commit 8743b73

Please sign in to comment.