diff options
Diffstat (limited to 'zuul')
| -rw-r--r-- | zuul/merger.py | 4 | ||||
| -rw-r--r-- | zuul/scheduler.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/zuul/merger.py b/zuul/merger.py index d9199c884..8ab3ee869 100644 --- a/zuul/merger.py +++ b/zuul/merger.py @@ -123,7 +123,7 @@ class Merger(object): log = logging.getLogger("zuul.Merger") def __init__(self, trigger, working_root, push_refs, sshkey, email, - username): + username): self.trigger = trigger self.repos = {} self.working_root = working_root @@ -227,7 +227,7 @@ class Merger(object): target_ref=target_ref, mode=mode) # Sibling changes exist. Merge current change against newest sibling. elif (len(sibling_items) >= 2 and - sibling_items[-2].current_build_set.commit): + sibling_items[-2].current_build_set.commit): last_commit = sibling_items[-2].current_build_set.commit commit = self._mergeChange(item.change, last_commit, target_ref=target_ref, mode=mode) diff --git a/zuul/scheduler.py b/zuul/scheduler.py index b92f18745..52df7db73 100644 --- a/zuul/scheduler.py +++ b/zuul/scheduler.py @@ -428,8 +428,8 @@ class Scheduler(threading.Thread): continue item.change.project = project severed = item in shared_queue.severed_heads - if not new_pipeline.manager.reEnqueueItem(item, - severed=severed): + if not new_pipeline.manager.reEnqueueItem( + item, severed=severed): items_to_remove.append(item) builds_to_remove = [] for build, item in old_pipeline.manager.building_jobs.items(): |