commit d9d0e548c67a006c79c003eb29d1f3ee5ac9ae47
author Jenkins <jenkins@review.openstack.org> Thu Apr 14 18:41:44 2016 +0000
committer Gerrit Code Review <review@openstack.org> Thu Apr 14 18:41:44 2016 +0000
tree f4039ebb4b5987aede92333273c77a3b9eb19605
parent 152b82bee014ff9dc8cceddd3edd9f795461a362
parent fe20ccf98ba21e904e285aeb3179b24abc0876c8

Merge "Update merge status after merge:merge is submitted"

zuul/scheduler.py

diff --git a/zuul/scheduler.py b/zuul/scheduler.py
index 118cbfc..48bb5e3 100644
--- a/zuul/scheduler.py
+++ b/zuul/scheduler.py
@@ -1450,7 +1450,6 @@
             return True
         if build_set.merge_state == build_set.PENDING:
             return False
-        build_set.merge_state = build_set.PENDING
         ref = build_set.ref
         if hasattr(item.change, 'refspec') and not ref:
             self.log.debug("Preparing ref for: %s" % item.change)
@@ -1468,6 +1467,8 @@
             self.sched.merger.updateRepo(item.change.project.name,
                                          url, build_set,
                                          self.pipeline.precedence)
+        # merge:merge has been emitted properly:
+        build_set.merge_state = build_set.PENDING
         return False
 
     def _launchJobs(self, item, jobs):