From 3adb5591a8b7d89eafe6b6c1b7fd771d1ebe15ed Mon Sep 17 00:00:00 2001 From: Neil Williams Date: Tue, 29 Nov 2011 17:37:24 -0800 Subject: [PATCH] Make git revision lookup fail gracefully. --- r2/r2/lib/app_globals.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/r2/r2/lib/app_globals.py b/r2/r2/lib/app_globals.py index 1900d1f8c..f6cfc7126 100755 --- a/r2/r2/lib/app_globals.py +++ b/r2/r2/lib/app_globals.py @@ -357,16 +357,12 @@ class Globals(object): # try to set the source control revision number try: - popen = subprocess.Popen(["git", "log", "--date=short", - "--pretty=format:%H %h", '-n1'], - stdin=subprocess.PIPE, - stdout=subprocess.PIPE) - resp, stderrdata = popen.communicate() - resp = resp.strip().split(' ') - self.version, self.short_version = resp - except object, e: + self.version = subprocess.check_output(["git", "rev-parse", "HEAD"]) + except subprocess.CalledProcessError, e: self.log.info("Couldn't read source revision (%r)" % e) self.version = self.short_version = '(unknown)' + else: + self.short_version = self.version[:7] if self.log_start: self.log.error("reddit app %s:%s started %s at %s" %