Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/commands
diff options
context:
space:
mode:
authorDaniel Narvaez <dwnarvaez@gmail.com>2012-12-28 21:20:08 (GMT)
committer Daniel Narvaez <dwnarvaez@gmail.com>2012-12-28 21:20:08 (GMT)
commit39ba6c7842073a2db94a0022e556c71518f06da2 (patch)
treef28ed67425546d1b9cda4f3aeb62d90ee891a81b /commands
parenta76f5c9526141437d882d001b2b45e3a38920442 (diff)
Try to get steps ordering right
Diffstat (limited to 'commands')
-rwxr-xr-xcommands/build14
-rwxr-xr-xcommands/check12
-rwxr-xr-xcommands/pull11
-rwxr-xr-xcommands/run7
4 files changed, 34 insertions, 10 deletions
diff --git a/commands/build b/commands/build
index da62f82..9d8b51b 100755
--- a/commands/build
+++ b/commands/build
@@ -6,6 +6,7 @@ import sys
import common
from devbot import build
+from devbot import system
parser = argparse.ArgumentParser()
parser.add_argument("module", nargs="?", help="name of the module to build")
@@ -15,9 +16,14 @@ args = parser.parse_args()
common.setup(log_name="build")
if args.module:
- success = build.build_one(args.module)
+ if not build.build_one(args.module):
+ sys.exit(1)
else:
- success = build.build(full=args.full)
+ if not system.check(lazy=True):
+ sys.exit(1)
-if not success:
- sys.exit(1)
+ if not build.pull(lazy=True):
+ sys.exit(1)
+
+ if not build.build(full=args.full):
+ sys.exit(1)
diff --git a/commands/check b/commands/check
index ff4ac32..a283940 100755
--- a/commands/check
+++ b/commands/check
@@ -96,9 +96,17 @@ os.environ["SUGAR_PROFILE"] = "uitests"
os.environ["GTK_MODULES"] = "gail:atk-bridge"
if args.module:
- check.check_one(args.module)
+ if not check.check_one(args.module):
+ sys.exit(1)
else:
- print "\n= Checking =\n"
+ if not system.check(lazy=True):
+ sys.exit(1)
+
+ if not build.pull(lazy=True):
+ sys.exit(1)
+
+ if not build.build():
+ sys.exit(1)
_check_devbot()
diff --git a/commands/pull b/commands/pull
index cca1ff2..7314278 100755
--- a/commands/pull
+++ b/commands/pull
@@ -6,6 +6,7 @@ import sys
import common
from devbot import build
+from devbot import system
parser = argparse.ArgumentParser()
parser.add_argument("module", nargs="?", help="name of the module to pull")
@@ -14,9 +15,11 @@ args = parser.parse_args()
common.setup(log_name="pull")
if args.module:
- success = build.pull_one(args.module)
+ if not build.pull_one(args.module):
+ sys.exit(1)
else:
- success = build.pull()
+ if not system.check(lazy=True):
+ sys.exit(1)
-if not success:
- sys.exit(1)
+ if not build.pull():
+ sys.exit(1)
diff --git a/commands/run b/commands/run
index e66eaf4..e3f311a 100755
--- a/commands/run
+++ b/commands/run
@@ -6,9 +6,16 @@ import common
from devbot import run
from devbot import build
+from devbot import system
common.setup(log_name="run")
+if not system.check(lazy=True):
+ sys.exit(1)
+
+if not build.pull(lazy=True):
+ sys.exit(1)
+
if not build.build():
sys.exit(1)