Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-11-29 20:41:01 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-11-29 20:41:01 +0400
commit6a6c7b10de85c2ed01ca68f95d6c70f81522f3d3 (patch)
treecbe4a029ddd93f40563720f351a273613dd7613b /build_files
parentf359b931f916efd5d9c7a0afa40b62dc90501a41 (diff)
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.
Diffstat (limited to 'build_files')
-rw-r--r--build_files/scons/tools/Blender.py2
1 files changed, 1 insertions, 1 deletions
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 == '':