[Bf-blender-cvs] [3bf77c3] master: Fix scons compile after last commit ( unwanted new line )
Jens Verwiebe
noreply at git.blender.org
Fri Nov 29 17:04:45 CET 2013
Commit: 3bf77c34eb2be69955afa7f8b7fb014a186ea09c
Author: Jens Verwiebe
Date: Fri Nov 29 17:04:29 2013 +0100
http://developer.blender.org/rB3bf77c34eb2be69955afa7f8b7fb014a186ea09c
Fix scons compile after last commit ( unwanted new line )
===================================================================
M build_files/scons/tools/Blender.py
===================================================================
diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py
index d9c2edf..a6e8678 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.replace('\n', '')
build_branch = os.popen('git rev-parse --abbrev-ref HEAD').read().strip()
if build_hash == '':
More information about the Bf-blender-cvs
mailing list