From 5f24c8834c52d947a5863a696ae5148d6d198189 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Sun, 6 Jan 2013 00:34:12 +0000 Subject: [PATCH] Don't show svnversion non-version response svn: r21006 --- gramps/gen/svn_revision.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/gramps/gen/svn_revision.py b/gramps/gen/svn_revision.py index 692b7bf40..1c13aec47 100644 --- a/gramps/gen/svn_revision.py +++ b/gramps/gen/svn_revision.py @@ -37,6 +37,17 @@ def get_svn_revision(path=""): stdout=subprocess.PIPE, stderr=subprocess.PIPE) (stdout, stderr) = p.communicate() except: - pass - return "-r" + cuni(stdout) if stdout else "" + return "" # subprocess failed + # subprocess worked + if stdout: # has output + stdout = cuni(stdout) # get a proper string + if " " in stdout: # one of svnversion's non-version responses: + # 'Unversioned directory' + # 'Unversioned file' + # 'Uncommitted local addition, copy or move' + return "" + else: + return "-r" + stdout + else: # no output from svnversion + return ""