aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Conrad <aconrad103@gmail.com>2019-09-27 10:33:10 -0500
committerDylan Baker <dylan@pnwbakers.com>2019-09-27 13:09:52 -0700
commit714908e5d9ce8aa02eef1563727a78766ac9a4a5 (patch)
tree319b777f25051bfaad6e561059ac83bd9acd7eba
parent3fd460bce76cafbc55a98c143245d81c1996c59d (diff)
downloadmeson-714908e5d9ce8aa02eef1563727a78766ac9a4a5.zip
meson-714908e5d9ce8aa02eef1563727a78766ac9a4a5.tar.gz
meson-714908e5d9ce8aa02eef1563727a78766ac9a4a5.tar.bz2
Catch NotADirectoryError to fix selinux error
Fixes #4798
-rw-r--r--mesonbuild/minstall.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py
index 4f894a2..731e093 100644
--- a/mesonbuild/minstall.py
+++ b/mesonbuild/minstall.py
@@ -157,7 +157,7 @@ def restore_selinux_contexts():
'''
try:
subprocess.check_call(['selinuxenabled'])
- except (FileNotFoundError, PermissionError, subprocess.CalledProcessError):
+ except (FileNotFoundError, NotADirectoryError, PermissionError, subprocess.CalledProcessError):
# If we don't have selinux or selinuxenabled returned 1, failure
# is ignored quietly.
return