From 591ce11e8c25db6c4ff92f4cd04d6aacee0de143 Mon Sep 17 00:00:00 2001 From: Tobias Henkel Date: Thu, 30 Jul 2020 15:56:33 +0200 Subject: [PATCH] Annotate all canMerge calls with event id The canMerge method is called without the event id from a few places. Change-Id: I3233bd840dd0cc10817077c081c52852352df2ff --- zuul/manager/dependent.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/zuul/manager/dependent.py b/zuul/manager/dependent.py index cf8c7f8ba9..c219182336 100644 --- a/zuul/manager/dependent.py +++ b/zuul/manager/dependent.py @@ -92,7 +92,8 @@ class DependentPipelineManager(SharedQueuePipelineManager): change_queue)) continue source = other_change.project.source - if source.canMerge(other_change, self.getSubmitAllowNeeds()): + if source.canMerge(other_change, self.getSubmitAllowNeeds(), + event=event): log.debug(" Change %s needs %s and is ready to merge", other_change, change) to_enqueue.append(other_change) @@ -168,7 +169,8 @@ class DependentPipelineManager(SharedQueuePipelineManager): log.debug(" Needed change is already ahead in the queue") continue if needed_change.project.source.canMerge( - needed_change, self.getSubmitAllowNeeds()): + needed_change, self.getSubmitAllowNeeds(), + event=event): log.debug(" Change %s is needed", needed_change) if needed_change not in changes_needed: changes_needed.append(needed_change)