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

[FIX] forwardport: the fix

Browse Source 
it's a per-call parameter not a per-instance one
This commit is contained in:
Xavier Morel 2019-10-18 08:11:27 +02:00
parent c1cef0c18b
commit 13d76fdfb9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
forwardport/models/forwardport.py
View File

@ -132,9 +132,9 @@ class DeleteBranches(models.Model, Queue):
_deleter.info('✘ PR owner != FP target owner (%s)', repo_owner) _deleter.info('✘ PR owner != FP target owner (%s)', repo_owner)
return # probably don't have access to arbitrary repos return # probably don't have access to arbitrary repos
github = GH(token=repository.project_id.fp_github_token, repo=fp_remote, check=False) github = GH(token=repository.project_id.fp_github_token, repo=fp_remote)
refurl = 'git/refs/heads/' + branch refurl = 'git/refs/heads/' + branch
ref = github('get', refurl) ref = github('get', refurl, check=False)
if ref.status_code != 200: if ref.status_code != 200:
_deleter.info("✘ branch already deleted (%s)", ref.json()) _deleter.info("✘ branch already deleted (%s)", ref.json())
return return
@ -149,7 +149,7 @@ class DeleteBranches(models.Model, Queue):
) )
return return
r = github('delete', refurl) r = github('delete', refurl, check=False)
assert r.status_code == 204, \ assert r.status_code == 204, \
"Tried to delete branch %s of %s, got %s" % ( "Tried to delete branch %s of %s, got %s" % (
branch, self.pr_id.display_name, branch, self.pr_id.display_name,