From 50d13ba5c4fb91bada63e4140b44cde8dfe3c683 Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Mon, 6 Aug 2012 18:41:20 +0400 Subject: [PATCH] Fixed xml name generation in run.py --- modules/ts/misc/run.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/modules/ts/misc/run.py b/modules/ts/misc/run.py index 79dad8d8fd..737a2eea35 100644 --- a/modules/ts/misc/run.py +++ b/modules/ts/misc/run.py @@ -337,10 +337,9 @@ class RunInfo(object): def getSvnVersion(self, path, name): if not path: - setattr(self, name, None) - return - if not self.svnversion_path and hostos == 'nt': - self.tryGetSvnVersionWithTortoise(path, name) + val = None + elif not self.svnversion_path and hostos == 'nt': + val = self.tryGetSvnVersionWithTortoise(path, name) else: svnversion = self.svnversion_path if not svnversion: @@ -348,11 +347,14 @@ class RunInfo(object): try: output = Popen([svnversion, "-n", path], stdout=PIPE, stderr=PIPE).communicate() if not output[1]: - setattr(self, name, output[0]) + val = output[0] else: - setattr(self, name, None) + val = None except OSError: - setattr(self, name, None) + val = None + if val: + val = val.replace(" ", "_") + setattr(self, name, val) def tryGetSvnVersionWithTortoise(self, path, name): try: @@ -371,9 +373,9 @@ class RunInfo(object): tmpfile = open(tmpfilename2, "r") version = tmpfile.read() tmpfile.close() - setattr(self, name, version) + return version except: - setattr(self, name, None) + return None finally: if dir: shutil.rmtree(dir) -- GitLab