zuul
/
zuul
Code Issues Proposed changes

Merge "Don't require 'commit' attribute in merge event"

This commit is contained in:
Jenkins 2016-02-09 09:46:49 +00:00 committed by Gerrit Code Review
parent af17a978c4 b078bb4850
commit 52a249718e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zuul/scheduler.py
View File

@ -1647,9 +1647,9 @@ class BasePipelineManager(object):
if event.merged:
build_set.commit = event.commit
elif event.updated:
if not isinstance(item, NullChange):
if not isinstance(item.change, NullChange):
build_set.commit = item.change.newrev
if not build_set.commit:
if not build_set.commit and not isinstance(item.change, NullChange):
self.log.info("Unable to merge change %s" % item.change)
self.pipeline.setUnableToMerge(item)