Merge lp:~james-w/tarmac/lock-contention into lp:tarmac

[James Westby]

Ignore LockContention errors when trying to merge a branch.

Ignore LockContention errors when trying to merge a branch.

(from the u1 fork)

[Paul Hummer (rockstar)]

review: Approve

[Paul Hummer (rockstar)]

The prerequisite lp:~james-w/tarmac/one-at-a-time has not yet been merged into lp:tarmac.

=== modified file 'tarmac/bin/commands.py'
--- tarmac/bin/commands.py	2013-02-01 17:28:25 +0000
+++ tarmac/bin/commands.py	2013-02-01 17:28:25 +0000
@@ -5,7 +5,7 @@
 import re
 
 from bzrlib.commands import Command
-from bzrlib.errors import PointlessMerge
+from bzrlib.errors import PointlessMerge, LockContention
 from bzrlib.help import help_commands
 from launchpadlib.launchpad import Launchpad
 from launchpadlib.uris import (LPNET_SERVICE_ROOT,
@@ -374,6 +374,8 @@
                     # If we've been asked to only merge one branch, then exit.
                     if merged and self.config.one:
                         break
+                except LockContention:
+                    continue
                 except Exception, error:
                     self.logger.error(
                         'An error occurred trying to merge %s: %s',