svn commit: r1936153 - subversion/trunk/tools/dist

Author: dsahlberg
Date: Wed Jul 15 07:14:01 2026
New Revision: 1936153

Log:
Fix error message when nominating a backport via the script

* tools/dist/nominate-backport.py
  (): We use backport.wc so better import it
  (main): Expect stderr W170000 (URL non-existent) when calling svn info to
          check for a backport branch - this means no branch exists.

Modified:
   subversion/trunk/tools/dist/nominate-backport.py

Modified: subversion/trunk/tools/dist/nominate-backport.py
==============================================================================
--- subversion/trunk/tools/dist/nominate-backport.py	Wed Jul 15 05:30:52 2026	(r1936152)
+++ subversion/trunk/tools/dist/nominate-backport.py	Wed Jul 15 07:14:01 2026	(r1936153)
@@ -39,6 +39,7 @@ import textwrap
 
 import backport.merger
 import backport.status
+import backport.wc
 
 # Constants
 STATUS = './STATUS'
@@ -166,7 +167,8 @@ def main():
 
   # Determine whether a backport branch exists
   (exit_code, branch, stderr) = backport.merger.run_svn(['info', '--show-item', 'url', '--',
-                              wcinfo["URL"] + '-r'+str(revisions[0])]).replace('\n', '')
+                              wcinfo["URL"] + '-r'+str(revisions[0])], 'W170000')
+  branch.replace('\n', '')
   if branch == "":
     branch = None