forked from bartvdbraak/blender
Fix compilation error with scons when building from detached head
This commit is contained in:
parent
a1aa96940c
commit
42615d88b6
8
build_files/scons/tools/Blender.py
Normal file → Executable file
8
build_files/scons/tools/Blender.py
Normal file → Executable file
@ -428,7 +428,8 @@ def buildinfo(lenv, build_type):
|
||||
build_hash = btools.get_command_output(['git', 'rev-parse', '--short', '@{u}']).strip()
|
||||
except subprocess.CalledProcessError:
|
||||
# assume branch has no upstream configured
|
||||
build_hash = ''
|
||||
build_hash = btools.get_command_output(['git', 'rev-parse', '--short', 'HEAD']).strip()
|
||||
no_upstream = True
|
||||
|
||||
build_branch = btools.get_command_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD']).strip()
|
||||
|
||||
@ -442,10 +443,7 @@ def buildinfo(lenv, build_type):
|
||||
if tag_hashes.find(head_hash) != -1:
|
||||
build_branch = 'master'
|
||||
|
||||
if build_hash == '':
|
||||
build_hash = btools.get_command_output(['git', 'rev-parse', '--short', 'HEAD']).strip()
|
||||
no_upstream = True
|
||||
else:
|
||||
if not no_upstream:
|
||||
older_commits = btools.get_command_output(['git', 'log', '--oneline', 'HEAD..@{u}']).strip()
|
||||
if older_commits:
|
||||
build_hash = btools.get_command_output(['git', 'rev-parse', '--short', 'HEAD']).strip()
|
||||
|
Loading…
Reference in New Issue
Block a user