diff options
author | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-12-28 16:58:07 (GMT) |
---|---|---|
committer | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-12-28 16:59:32 (GMT) |
commit | 1b32c98f14766d3e956c52d6b803b19e5126c893 (patch) | |
tree | 0a03486438f79cf6716a37c9661ef31f3c4adc11 | |
parent | 3f8c1c9ba806e2e76514c3e2874c7ae24e5dac65 (diff) |
Move system checking to the build module
-rwxr-xr-x | commands/build | 4 | ||||
-rw-r--r-- | devbot/build.py | 7 | ||||
-rw-r--r-- | devbot/system.py | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/commands/build b/commands/build index 38cae6b..da62f82 100755 --- a/commands/build +++ b/commands/build @@ -5,7 +5,6 @@ import sys import common -from devbot import system from devbot import build parser = argparse.ArgumentParser() @@ -15,9 +14,6 @@ args = parser.parse_args() common.setup(log_name="build") -if not system.check(skip_if_unchanged=True): - sys.exit(1) - if args.module: success = build.build_one(args.module) else: diff --git a/devbot/build.py b/devbot/build.py index 6380c6e..95652b5 100644 --- a/devbot/build.py +++ b/devbot/build.py @@ -12,6 +12,7 @@ from devbot import state from devbot import utils from devbot import release from devbot import git +from devbot import system _builders = {} _distributors = {} @@ -57,7 +58,11 @@ def build(full=False): state.full_build_touch() - pull(lazy=True) + if not system.check(lazy=True): + return False + + if not pull(lazy=True): + return False to_build = [] for module in config.load_modules(): diff --git a/devbot/system.py b/devbot/system.py index 3cf409e..cefca1c 100644 --- a/devbot/system.py +++ b/devbot/system.py @@ -11,8 +11,8 @@ _checkers = {} def check(remove=False, update=False, test=False, interactive=True, - skip_if_unchanged=False): - if skip_if_unchanged: + lazy=False): + if lazy: if state.system_check_is_unchanged(): return True |