[Bf-blender-cvs] [6f51df5] master: SCons: Attempt to deal with branches without upstream configured
Sergey Sharybin
noreply at git.blender.org
Fri Mar 20 10:04:33 CET 2015
Commit: 6f51df5384f1a78ea0359459f410a9724d7f2e80
Author: Sergey Sharybin
Date: Fri Mar 20 14:03:54 2015 +0500
Branches: master
https://developer.blender.org/rB6f51df5384f1a78ea0359459f410a9724d7f2e80
SCons: Attempt to deal with branches without upstream configured
===================================================================
M build_files/scons/tools/Blender.py
===================================================================
diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py
index 060904e..dbe1caf 100644
--- a/build_files/scons/tools/Blender.py
+++ b/build_files/scons/tools/Blender.py
@@ -441,7 +441,7 @@ def buildinfo(lenv, build_type):
no_upstream = False
try :
- build_hash = btools.get_command_output(['git', 'rev-parse', '--short', '@{u}']).strip()
+ build_hash = btools.get_command_output(['git', 'rev-parse', '--short', '@{u}'], stderr=subprocess.STDOUT).strip()
except subprocess.CalledProcessError:
# assume branch has no upstream configured
build_hash = btools.get_command_output(['git', 'rev-parse', '--short', 'HEAD']).strip()
More information about the Bf-blender-cvs
mailing list