Commit 50d13ba5 authored by Andrey Kamaev's avatar Andrey Kamaev

Fixed xml name generation in run.py

parent 9981b283
...@@ -337,10 +337,9 @@ class RunInfo(object): ...@@ -337,10 +337,9 @@ class RunInfo(object):
def getSvnVersion(self, path, name): def getSvnVersion(self, path, name):
if not path: if not path:
setattr(self, name, None) val = None
return elif not self.svnversion_path and hostos == 'nt':
if not self.svnversion_path and hostos == 'nt': val = self.tryGetSvnVersionWithTortoise(path, name)
self.tryGetSvnVersionWithTortoise(path, name)
else: else:
svnversion = self.svnversion_path svnversion = self.svnversion_path
if not svnversion: if not svnversion:
...@@ -348,11 +347,14 @@ class RunInfo(object): ...@@ -348,11 +347,14 @@ class RunInfo(object):
try: try:
output = Popen([svnversion, "-n", path], stdout=PIPE, stderr=PIPE).communicate() output = Popen([svnversion, "-n", path], stdout=PIPE, stderr=PIPE).communicate()
if not output[1]: if not output[1]:
setattr(self, name, output[0]) val = output[0]
else: else:
setattr(self, name, None) val = None
except OSError: except OSError:
setattr(self, name, None) val = None
if val:
val = val.replace(" ", "_")
setattr(self, name, val)
def tryGetSvnVersionWithTortoise(self, path, name): def tryGetSvnVersionWithTortoise(self, path, name):
try: try:
...@@ -371,9 +373,9 @@ class RunInfo(object): ...@@ -371,9 +373,9 @@ class RunInfo(object):
tmpfile = open(tmpfilename2, "r") tmpfile = open(tmpfilename2, "r")
version = tmpfile.read() version = tmpfile.read()
tmpfile.close() tmpfile.close()
setattr(self, name, version) return version
except: except:
setattr(self, name, None) return None
finally: finally:
if dir: if dir:
shutil.rmtree(dir) shutil.rmtree(dir)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment