commit 52a249718e9d22f44017ac6838befb1d7a8cbb72
author Jenkins <jenkins@review.openstack.org> Tue Feb 09 09:46:49 2016 +0000
committer Gerrit Code Review <review@openstack.org> Tue Feb 09 09:46:49 2016 +0000
tree 670fa5b64c11d9cb16cfc7528536eb4b2d18b9d1
parent af17a978c43ad1909b189d0fcaaac0757e91f518
parent b078bb4850e956c2d0b5d5c51397b9096de4abe0

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

zuul/scheduler.py

diff --git a/zuul/scheduler.py b/zuul/scheduler.py
index 0e3fea0..e1aa0c2 100644
--- a/zuul/scheduler.py
+++ b/zuul/scheduler.py
@@ -1647,9 +1647,9 @@
         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)