From 994cea467c2e8f0576b11fed4629e2b7f608db82 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 16 Jan 2024 07:54:43 +0100 Subject: [PATCH] [FIX] runbot_merge: typo in freeze wizard Forgot to deref the id of the staging we're trying to lock, so the specific case where we start a freeze with a bump PR and an outstanding staging in master would instantly blow up. --- runbot_merge/models/project_freeze/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runbot_merge/models/project_freeze/__init__.py b/runbot_merge/models/project_freeze/__init__.py index 77cffc96..2a0961bf 100644 --- a/runbot_merge/models/project_freeze/__init__.py +++ b/runbot_merge/models/project_freeze/__init__.py @@ -196,7 +196,7 @@ class FreezeWizard(models.Model): if self.bump_pr_ids and master.active_staging_id: self.env.cr.execute( 'SELECT * FROM runbot_merge_stagings WHERE id = %s FOR UPDATE NOWAIT', - [master.active_staging_id] + [master.active_staging_id.id] ) seq = itertools.count(start=1) # start reseq at 1