Commit: 6a6c7b10de85c2ed01ca68f95d6c70f81522f3d3
Author: Sergey Sharybin
Date: Fri Nov 29 22:41:01 2013 +0600
http://developer.blender.org/rB6a6c7b10de85c2ed01ca68f95d6c70f81522f3d3
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.
===================================================================
M build_files/scons/tools/Blender.py
===================================================================
diff --git a/build_files/scons/tools/Blender.py
b/build_files/scons/tools/Blender.py
index 3e41222..71585a5 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 == '':
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
