Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

6494: svn_revision module ignores translated SVN stdout value for "exported"

Browse Source 
svn: r21546
This commit is contained in:
Paul Franklin 2013-03-04 05:12:32 +00:00
parent 1d4ae20433
commit 7892d02a5d
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gramps/gen/svn_revision.py
View File

@ -39,18 +39,12 @@ def get_svn_revision(path=""):
except: except:
return "" # subprocess failed return "" # subprocess failed
# subprocess worked # subprocess worked
if stdout: # has output if stdout and len(stdout) > 0: # has output
stdout = cuni(stdout) # get a proper string stdout = cuni(stdout) # get a proper string
if (" " in stdout) or (stdout == "exported"): if stdout[0].isdigit():
# one of svnversion's 1.7 non-version responses:
# 'Unversioned directory'
# 'Unversioned file'
# 'Uncommitted local addition, copy or move'
# svnversion's 1.6 non-version response:
# 'exported'
return ""
else:
return "-r" + stdout return "-r" + stdout
else:
return ""
else: # no output from svnversion else: # no output from svnversion
return "" return ""