Skip to content

Commit 151b71d

Browse files
committed
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. git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1936153 13f79535-47bb-0310-9956-ffa450edef68
1 parent 196de5d commit 151b71d

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

tools/dist/nominate-backport.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939

4040
import backport.merger
4141
import backport.status
42+
import backport.wc
4243

4344
# Constants
4445
STATUS = './STATUS'
@@ -166,7 +167,8 @@ def main():
166167

167168
# Determine whether a backport branch exists
168169
(exit_code, branch, stderr) = backport.merger.run_svn(['info', '--show-item', 'url', '--',
169-
wcinfo["URL"] + '-r'+str(revisions[0])]).replace('\n', '')
170+
wcinfo["URL"] + '-r'+str(revisions[0])], 'W170000')
171+
branch.replace('\n', '')
170172
if branch == "":
171173
branch = None
172174

0 commit comments

Comments
 (0)