NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-27 13:25:47 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[FIX] forwardport: better version of previous fix

Browse Source 
Turns out we don't want to close the cursor on success, we just want to
commit, but that's not what the default context manager does.

So don't use said context manager.
This commit is contained in:
Xavier Morel 2019-10-01 09:57:35 +02:00
parent eb9eeb670a
commit a5794a1a24
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
runbot_merge/models/pull_requests.py
View File

@ -1264,19 +1264,21 @@ class Commit(models.Model):
# chances are low that we'll have more than one commit # chances are low that we'll have more than one commit
for c in self.search([('to_check', '=', True)]): for c in self.search([('to_check', '=', True)]):
try: try:
with self.env.cr: c.to_check = False
c.to_check = False st = json.loads(c.statuses)
st = json.loads(c.statuses) pr = PRs.search([('head', '=', c.sha)])
pr = PRs.search([('head', '=', c.sha)]) if pr:
if pr: pr._validate(st)
pr._validate(st) # heads is a json-encoded mapping of reponame:head, so chances
# heads is a json-encoded mapping of reponame:head, so chances # are if a sha matches a heads it's matching one of the shas
# are if a sha matches a heads it's matching one of the shas stagings = Stagings.search([('heads', 'ilike', c.sha)])
stagings = Stagings.search([('heads', 'ilike', c.sha)]) if stagings:
if stagings: stagings._validate()
stagings._validate()
except Exception: except Exception:
_logger.exception("Failed to apply commit %s (%s)", c, c.sha) _logger.exception("Failed to apply commit %s (%s)", c, c.sha)
self.env.cr.rollback()
else:
self.env.cr.commit()
_sql_constraints = [ _sql_constraints = [
('unique_sha', 'unique (sha)', 'no duplicated commit'), ('unique_sha', 'unique (sha)', 'no duplicated commit'),