get the svnversion from the xpra source as fallback

git-svn-id: https://xpra.org/svn/Xpra/trunk@6548 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · May 24, 2014 · f58aa3b · f58aa3b
1 parent 885a1e0
commit f58aa3b
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/tests/xpra/test_measure_perf.py b/src/tests/xpra/test_measure_perf.py
@@ -383,7 +383,13 @@ def get_stderr(command):
         VNCVIEWER_VERSION = "TigerVNC Viewer %s" % (v_lines[0].split()[5])
 print ("VNCVIEWER_VERSION=%s" % VNCVIEWER_VERSION)
 
-SVN_VERSION = getoutput(["svnversion", "-n"])
+#get svnversion, prefer directly from svn:
+try:
+    SVN_VERSION = getoutput(["svnversion", "-n"]).split(":")[-1]
+except:
+    SVN_VERSION = ""
+if not SVN_VERSION:
+    SVN_VERSION = getoutput(["python", "-c", "from xpra.src_info import REVISION,LOCAL_MODIFICATIONS;print(('r%s%s' % (REVISION, ' M'[int(bool(LOCAL_MODIFICATIONS))])).strip())"])
 
 WINDOW_MANAGER = os.environ.get("DESKTOP_SESSION", "unknown")