Merge lp:~dobey/tarmac/fix-633937 into lp:tarmac

[dobey]

Trap and log all exceptions from _do_merges when looping through all branches

[Paul Hummer (rockstar)]

review: Approve

=== modified file 'tarmac/bin/commands.py'
--- tarmac/bin/commands.py	2010-09-02 15:18:07 +0000
+++ tarmac/bin/commands.py	2010-09-16 18:56:09 +0000
@@ -287,4 +287,9 @@
                 self.logger.debug(
                     'Merging approved branches against %(branch)s' % {
                         'branch': branch})
-                self._do_merges(branch, imply_commit_message)
+                try:
+                    self._do_merges(branch, imply_commit_message)
+                except Exception, error:
+                    self.logger.error(
+                        'An error occurred trying to merge %s: %s',
+                        branch, error)