Merge "Don't report on non-live changes dequeueing"

This commit is contained in:
Jenkins 2015-02-26 19:06:45 +00:00 committed by Gerrit Code Review
commit 58fbc8854a

View File

@ -1365,10 +1365,11 @@ class BasePipelineManager(object):
self.cancelJobs(item)
self.dequeueItem(item)
self.pipeline.setDequeuedNeedingChange(item)
try:
self.reportItem(item)
except MergeFailure:
pass
if item.live:
try:
self.reportItem(item)
except MergeFailure:
pass
return (True, nnfi, ready_ahead)
dep_items = self.getFailingDependentItems(item)
actionable = change_queue.isActionable(item)