From 6a6c7b10de85c2ed01ca68f95d6c70f81522f3d3 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 29 Nov 2013 22:41:01 +0600 Subject: [PATCH] Correction to previous commit Better just use "strip", to be sure \r\n is also stripped. This also corresponds to what happens with popen() results. --- build_files/scons/tools/Blender.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index 3e41222a621..71585a5f50f 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -425,7 +425,7 @@ def buildinfo(lenv, build_type): process = subprocess.Popen(['git', 'rev-parse', '--short', '@{u}'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) build_hash, stderr = process.communicate() - build_hash = build_hash.rstrip('\n') + build_hash = build_hash.strip() build_branch = os.popen('git rev-parse --abbrev-ref HEAD').read().strip() if build_hash == '':