← Back to branch summary

~tarmac-control-tower/tarmac/main

« back to all changes in this revision

Viewing changes to tarmac/bin/commands.py

  • Committer: Tarmac
  • Author(s): Rodney Dawes
  • Date: 2010-09-18 17:12:12 UTC
  • mfrom: (355.3.1 fix-633937)
  • Revision ID: paul@eventuallyanyway.com-20100918171212-srhn26o2lmteyfk2
Trap and log all exceptions from _do_merges when looping through all branches

Show diffs side-by-side

added added

removed removed

Lines of Context:
tarmac/bin/commands.py
275
275
                self.logger.debug(
276
276
                    'Merging approved branches against %(branch)s' % {
277
277
                        'branch': branch})
278
 
                self._do_merges(branch, imply_commit_message)
 
278
                try:
 
279
                    self._do_merges(branch, imply_commit_message)
 
280
                except Exception, error:
 
281
                    self.logger.error(
 
282
                        'An error occurred trying to merge %s: %s',
 
283
                        branch, error)