From 26c12758b9dd99c7f135d56caf92c84c8242821c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Rahir=20=28rar=29?= <rar@odoo.com>
Date: Fri, 27 Mar 2026 07:40:28 +0100
Subject: [PATCH] Ensure that fw=no is handled before r+

---
 scripts/helpers.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/scripts/helpers.py b/scripts/helpers.py
index 52f40f0..cf36070 100644
--- a/scripts/helpers.py
+++ b/scripts/helpers.py
@@ -306,13 +306,15 @@ def make_PR(path, version, **kwargs) -> str:
         result = retry_cmd(["gh", "pr", "view", "--json", "url"], 3)
         url = json.loads(result.decode("utf-8"))["url"]
 
+        msg = []
         if stop:
-            retry_cmd(
-                ["gh", "pr", "comment", url, "--body", "robodoo fw=no"], 3
-            )
+            msg.append("robodoo fw=no")
         if autoCommit:
+            msg.append("robodoo r+")
+
+        if len(msg) > 0:
             retry_cmd(
-                ["gh", "pr", "comment", url, "--body", "robodoo r+"], 3
+                ["gh", "pr", "comment", url, "--body", "\n".join(msg)], 3
             )
         return url