Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-06-23 13:46:41 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-06-23 13:46:41 +0400
commit9b987103f6684f9abe55cd536b718bc95cb06f24 (patch)
treee837d71c1bdeed042d4515d9f0d15fec088e51d4 /build_files/scons
parent3bd965bc03500c552e043ad7e0eb55853e2b0755 (diff)
Use specified exception mask for buildinfo
This way we only catch exceptions which we're intended to and if something bad happens (like missing import due to refactor or so) we'll see them instantly.
Diffstat (limited to 'build_files/scons')
-rw-r--r--build_files/scons/tools/Blender.py2
-rw-r--r--build_files/scons/tools/btools.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py
index 4d9fb578c06..72eafcdd681 100644
--- a/build_files/scons/tools/Blender.py
+++ b/build_files/scons/tools/Blender.py
@@ -414,7 +414,7 @@ def buildinfo(lenv, build_type):
if os.path.isdir(os.path.abspath('.git')):
try:
build_commit_timestamp = subprocess.check_output(args=['git', 'log', '-1', '--format=%ct']).strip()
- except:
+ except OSError:
build_commit_timestamp = None
if not build_commit_timestamp:
# Git command not found
diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py
index bdbb016be1b..d22adfda5f6 100644
--- a/build_files/scons/tools/btools.py
+++ b/build_files/scons/tools/btools.py
@@ -58,7 +58,7 @@ def get_version():
def get_hash():
try:
build_hash = subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD']).strip()
- except:
+ except OSError:
build_hash = None
print("WARNING: could not use git to retrieve current Blender repository hash...")
if build_hash == '' or build_hash == None: