diff options
| -rw-r--r-- | src/lib/Server/Core.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/Server/Core.py b/src/lib/Server/Core.py index 8fb50ba12..e417f9aa0 100644 --- a/src/lib/Server/Core.py +++ b/src/lib/Server/Core.py @@ -204,12 +204,12 @@ class Core(object): self.cron = {} self.setup = setup self.plugins = {} + self.revision = '-1' try: self.svn = cfile.get('server', 'svn') == 'yes' self.read_svn_revision() except: self.svn = False - self.revision = '-1' mpath = cfile.get('server','repository') try: @@ -316,9 +316,11 @@ class Core(object): def read_svn_revision(self): '''Read svn revision information for the bcfg2 repository''' try: - revline = [line.split(': ')[1].strip() for line in os.popen("svn info %s" % (self.datastore)).readlines() if - line[:9] == 'Revision:'][-1] + data = os.popen("svn info %s" % (self.datastore)).readlines() + revline = [line.split(': ')[1].strip() for line in data if line[:9] == 'Revision:'][-1] self.revision = revline except IndexError: logger.error("Failed to read svn info; disabling svn support") + logger.error('''Ran command "svn info %s"''' % (self.datastore)) + logger.error("Got output: %s" % data) self.svn = False |