From: daid Date: Fri, 22 Nov 2013 14:23:20 +0000 (+0100) Subject: Fix the mac build. X-Git-Tag: 14.01~67 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=4b8ef8ef8a92e240a81c33abec805d6e36a62502;p=cura.git Fix the mac build. --- diff --git a/Cura/util/version.py b/Cura/util/version.py index 051f2414..023649ff 100644 --- a/Cura/util/version.py +++ b/Cura/util/version.py @@ -21,11 +21,14 @@ def getVersion(getGitVersion = True): versionFile = os.path.abspath(os.path.join(os.path.split(os.path.abspath(__file__))[0], "../version")) if getGitVersion: - gitProcess = subprocess.Popen(args = "git show -s --pretty=format:%H", shell = True, cwd = gitPath, stdout = subprocess.PIPE, stderr = subprocess.PIPE) - (stdoutdata, stderrdata) = gitProcess.communicate() + try: + gitProcess = subprocess.Popen(args = "git show -s --pretty=format:%H", shell = True, cwd = gitPath, stdout = subprocess.PIPE, stderr = subprocess.PIPE) + (stdoutdata, stderrdata) = gitProcess.communicate() - if gitProcess.returncode == 0: - return stdoutdata + if gitProcess.returncode == 0: + return stdoutdata + except: + pass gitHeadFile = gitPath + "/.git/refs/heads/SteamEngine" if os.path.isfile(gitHeadFile):