blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 768 Projects 19 Wiki Activity

Fix scons building in case git is not available. 

Not so nice to use try/except here, but simplest solution to avoid failing in case
git commands fail for some reason...
This commit is contained in:
Bastien Montagne 2014-06-20 18:13:20 +02:00
parent 01d802976f
commit 9b83ceb6f2
Notes: blender-bot 2023-02-14 10:28:16 +01:00 
Referenced by issue #40733, Segfault with hair particles cache and vgroups
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -412,7 +412,10 @@ def buildinfo(lenv, build_type):
build_time = time.strftime ("%H:%M:%S")
if os.path.isdir(os.path.abspath('.git')):
build_commit_timestamp = subprocess.check_output(args=['git', 'log', '-1', '--format=%ct']).strip()
try:
build_commit_timestamp = subprocess.check_output(args=['git', 'log', '-1', '--format=%ct']).strip()
except:
build_commit_timestamp = None
if not build_commit_timestamp:
# Git command not found
build_hash = 'unknown'

6
build_files/scons/tools/btools.py
View File

@ -56,7 +56,11 @@ def get_version():
raise Exception("%s: missing version string" % fname)
def get_hash():
build_hash = subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD']).strip()
try:
build_hash = subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD']).strip()
except:
build_hash = None
print("WARNING: could not use git to retrieve current Blender repository hash...")
if build_hash == '' or build_hash == None:
build_hash = 'UNKNOWN'