zuul
/
zuul
Code Issues Proposed changes

Merge "Merger: log non Git exceptions on merge"

This commit is contained in:
Jenkins 2014-02-25 19:16:36 +00:00 committed by Gerrit Code Review
parent 264b06ab6c 5f53e600c9
commit d2927763d6
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zuul/merger/merger.py
View File

@ -216,11 +216,14 @@ class Merger(object):
commit = repo.cherryPick(item['refspec']) commit = repo.cherryPick(item['refspec'])
else: else:
raise Exception("Unsupported merge mode: %s" % mode) raise Exception("Unsupported merge mode: %s" % mode)
except Exception: except git.GitCommandError:
# Log exceptions at debug level because they are # Log git exceptions at debug level because they are
# usually benign merge conflicts # usually benign merge conflicts
self.log.debug("Unable to merge %s" % item, exc_info=True) self.log.debug("Unable to merge %s" % item, exc_info=True)
return None return None
except Exception:
self.log.exception("Exception while merging a change:")
return None
return commit return commit