From 7233179d6ace9abf29be3ea954d6bc693015b6a7 Mon Sep 17 00:00:00 2001 From: xmo-odoo Date: Fri, 11 May 2018 14:14:00 +0200 Subject: [PATCH] [FIX] runbot_merge: only cancel active staging on p=0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Not when any priority is set on any PR… --- runbot_merge/models/pull_requests.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/runbot_merge/models/pull_requests.py b/runbot_merge/models/pull_requests.py index 23b24349..00aeeb25 100644 --- a/runbot_merge/models/pull_requests.py +++ b/runbot_merge/models/pull_requests.py @@ -504,11 +504,12 @@ class PullRequests(models.Model): if is_admin: ok = True self.priority = param - self.target.active_staging_id.cancel( - "P=0 on %s:%s by %s, unstaging %s", - self.repository.name, self.number, - author.github_login, self.target.name, - ) + if param == 0: + self.target.active_staging_id.cancel( + "P=0 on %s:%s by %s, unstaging %s", + self.repository.name, self.number, + author.github_login, self.target.name, + ) _logger.info( "%s %s(%s) on %s:%s by %s (%s)",