aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksey Filippov <alekseyf@google.com>2018-03-12 02:39:27 +0000
committerAleksey Filippov <alekseyf@google.com>2018-03-12 02:39:27 +0000
commit3493a372e2df477d3cb86dd628fc5a30797880d3 (patch)
treefd9fc561f58ac352d7fe2956fe4aa734121ce876
parent093bdcafc9a2a2602f8da7da3a010958cbb7d155 (diff)
downloadmeson-3493a372e2df477d3cb86dd628fc5a30797880d3.zip
meson-3493a372e2df477d3cb86dd628fc5a30797880d3.tar.gz
meson-3493a372e2df477d3cb86dd628fc5a30797880d3.tar.bz2
Use specific exception types instead of Exception
-rw-r--r--mesonbuild/scripts/meson_install.py2
-rwxr-xr-xtest cases/common/72 build always/version_gen.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/scripts/meson_install.py b/mesonbuild/scripts/meson_install.py
index 2a23f81..f895f17 100644
--- a/mesonbuild/scripts/meson_install.py
+++ b/mesonbuild/scripts/meson_install.py
@@ -283,7 +283,7 @@ def run_install_script(d):
rc = subprocess.call(script + args, env=child_env)
if rc != 0:
sys.exit(rc)
- except Exception:
+ except OSError:
print('Failed to run install script {!r}'.format(name))
sys.exit(1)
diff --git a/test cases/common/72 build always/version_gen.py b/test cases/common/72 build always/version_gen.py
index 17e613e..fbe2df9 100755
--- a/test cases/common/72 build always/version_gen.py
+++ b/test cases/common/72 build always/version_gen.py
@@ -8,7 +8,7 @@ def generate(infile, outfile, fallback):
workdir = '.'
try:
version = subprocess.check_output(['git', 'describe'], cwd=workdir).decode().strip()
- except Exception:
+ except (subprocess.CalledProcessError, OSError, UnicodeDecodeError):
version = fallback
with open(infile) as f:
newdata = f.read().replace('@VERSION@', version)
@@ -17,7 +17,7 @@ def generate(infile, outfile, fallback):
olddata = f.read()
if olddata == newdata:
return
- except Exception:
+ except OSError:
pass
with open(outfile, 'w') as f:
f.write(newdata)