NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-15 23:45:44 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[FIX] runbot_merge: only cancel active staging on p=0

Browse Source 
Not when any priority is set on any PR…
This commit is contained in:
xmo-odoo 2018-05-11 14:14:00 +02:00
parent 9286b346e8
commit 7233179d6a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
runbot_merge/models/pull_requests.py
View File

@ -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)",