Merge lp:~james-w/tarmac/exit-status into lp:tarmac

[James Westby]

Return exit status of the tarmac script.

This allows the commands to set an exit status for the whole
tarmac script. We need it so that we can communicate some status
information to jenkins.

(from the u1 fork)

[Paul Hummer (rockstar)]

review: Approve

[Paul Hummer (rockstar)]

The prerequisite lp:~james-w/tarmac/break-up-do-merges has not yet been merged into lp:tarmac.

[dobey (dobey)]

Please create bugs for the issues, include tests, and split the changes into a branch or two which do not have unnecessary dependencies on other unrelated changes.

review: Disapprove

Unmerged revisions

424. By James Westby on 2013-01-31

Merged break-up-do-merges into exit-status.

423. By James Westby on 2013-01-28

Merged break-up-do-merges into exit-status.

422. By James Westby on 2013-01-24

Merged break-up-do-merges into exit-status.

421. By James Westby on 2013-01-24

Merged break-up-do-merges into exit-status.

420. By James Westby on 2012-12-18

Merged break-up-do-merges into exit-status.

419. By James Westby on 2012-12-18

Allow the command to set the exit status.

418. By James Westby on 2012-12-18

Remove the option that isn't defined yet.

417. By James Westby on 2012-12-18

Break up the very large do_merges method somewhat.

416. By James Westby on 2012-12-18

Add the commit message plugin that sets [r=<reviewer>] and bug info.

415. By James Westby on 2012-12-18

Decode stderr/stdout from the command, ignoring errors.

We were seeing UnicodeDecodeErrors in Jenkins on occaision, so
we changed the code to be more robust, and to discard anything
that couldn't be decoded from utf-8.

=== modified file 'bin/tarmac'
--- bin/tarmac	2010-06-17 17:23:37 +0000
+++ bin/tarmac	2013-02-01 17:17:22 +0000
@@ -2,5 +2,7 @@
 # vim:filetype=python
 '''Main tarmac script.'''
 
+import sys
+
 from tarmac.bin import main
-main()
+sys.exit(main())
 
=== modified file 'tarmac/bin/__init__.py'
--- tarmac/bin/__init__.py	2010-09-02 15:18:07 +0000
+++ tarmac/bin/__init__.py	2013-02-01 17:17:22 +0000
@@ -27,4 +27,4 @@
     args = sys.argv[1:]
     if not args:
         args = ['help']
-    registry.run(args)
+    return registry.run(args)
 
=== modified file 'tarmac/bin/commands.py'
--- tarmac/bin/commands.py	2013-02-01 17:17:22 +0000
+++ tarmac/bin/commands.py	2013-02-01 17:17:22 +0000
@@ -397,3 +397,6 @@
                         'An error occurred trying to merge %s: %s',
                         branch, error)
                     raise
+        if len(filter(lambda x: x is False, statuses)) > 0:
+            return 2
+        return 0
 
=== modified file 'tarmac/bin/registry.py'
--- tarmac/bin/registry.py	2010-10-25 20:20:18 +0000
+++ tarmac/bin/registry.py	2013-02-01 17:17:22 +0000
@@ -45,7 +45,7 @@
 
     def _run(self, args):
         '''Execute the command.'''
-        run_bzr(args)
+        return run_bzr(args)
 
     def install_hooks(self):
         '''Use the bzrlib Command support for running commands.'''
@@ -57,7 +57,7 @@
     def run(self, args):
         '''Execute the command.'''
         try:
-            self._run(args)
+            return self._run(args)
         except BzrCommandError, e:
             sys.exit('tarmac: ERROR: ' + str(e))