Updated mergeready to work with svn 1.9, which seems to return an error for properties which aren't found.
- Legacy-Id: 10266
This commit is contained in:
parent
effd727a83
commit
6335cf510c
|
@ -270,8 +270,15 @@ for entry in ready:
|
|||
if 'M' in type or 'A' in type or 'D' in type:
|
||||
break
|
||||
# Get the test status
|
||||
cmd = 'svn propget --revprop -r %s "test:unittest"' % rev
|
||||
unittest = pipe(cmd).strip()
|
||||
try:
|
||||
cmd = 'svn propget --revprop -r %s "test:unittest"' % rev
|
||||
unittest = pipe(cmd).strip()
|
||||
except OSError as e:
|
||||
if "E200017" in str(e):
|
||||
unittestt = ""
|
||||
pass
|
||||
else:
|
||||
raise
|
||||
#
|
||||
merge_path = os.path.join(*path.split(os.path.sep)[:4])
|
||||
if not (rev, repo, merge_path) in hold:
|
||||
|
|
Loading…
Reference in a new issue