Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

SCons: Attempt to deal with branches without upstream configured

Browse Source
This commit is contained in:
Sergey Sharybin
2015-03-20 14:03:54 +05:00
parent 6de12b1b43
commit 6f51df5384
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build_files/scons/tools/Blender.py
View File

@@ -441,7 +441,7 @@ def buildinfo(lenv, build_type):
no_upstream = False no_upstream = False
try : 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: except subprocess.CalledProcessError:
# assume branch has no upstream configured # assume branch has no upstream configured
build_hash = btools.get_command_output(['git', 'rev-parse', '--short', 'HEAD']).strip() build_hash = btools.get_command_output(['git', 'rev-parse', '--short', 'HEAD']).strip()