[Bf-blender-cvs] [e81b938] master: Fix scons unable to build with sources tar archive (no git repo available in this case).

Bastien Montagne noreply at git.blender.org
Wed Jul 2 20:31:31 CEST 2014


Commit: e81b9386318a00beb949e23f08ddb0aba7bfc0a9
Author: Bastien Montagne
Date:   Wed Jul 2 20:29:50 2014 +0200
https://developer.blender.org/rBe81b9386318a00beb949e23f08ddb0aba7bfc0a9

Fix scons unable to build with sources tar archive (no git repo available in this case).

Reported by Clouclou over IRC, thanks!

===================================================================

M	build_files/scons/tools/btools.py

===================================================================

diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py
index 4124d06..214827b 100644
--- a/build_files/scons/tools/btools.py
+++ b/build_files/scons/tools/btools.py
@@ -76,6 +76,9 @@ def get_hash():
     except OSError:
         build_hash = None
         print("WARNING: could not use git to retrieve current Blender repository hash...")
+    except subprocess.CalledProcessError as e:
+        build_hash = None
+        print("WARNING: git errored while retrieving current Blender repository hash (%d)..." % e.returncode)
     if build_hash == '' or build_hash == None:
         build_hash = 'UNKNOWN'




More information about the Bf-blender-cvs mailing list