aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabrice Fontaine <fontaine.fabrice@gmail.com>2018-03-13 18:52:36 +0100
committerJussi Pakkanen <jpakkane@gmail.com>2018-03-15 21:12:23 +0200
commit2e128f71bb3215567a5bb2267abae00ed4ee09be (patch)
treebe9b8c6e95276ed68386f1b0ee3433201ab74f9c
parent24ae120868fa00f6b6866bcc80e8f3d13203fe89 (diff)
downloadmeson-2e128f71bb3215567a5bb2267abae00ed4ee09be.zip
meson-2e128f71bb3215567a5bb2267abae00ed4ee09be.tar.gz
meson-2e128f71bb3215567a5bb2267abae00ed4ee09be.tar.bz2
Fix FileNotFoundError when restorecon unavailable
Fixes: - http://autobuild.buildroot.net/results/d5dcdfdfab3503fdc387f99e68267972a38c417d Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-rw-r--r--mesonbuild/scripts/meson_install.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/mesonbuild/scripts/meson_install.py b/mesonbuild/scripts/meson_install.py
index f895f17..1414ace 100644
--- a/mesonbuild/scripts/meson_install.py
+++ b/mesonbuild/scripts/meson_install.py
@@ -97,6 +97,10 @@ def restore_selinux_contexts():
# is ignored quietly.
return
+ if not shutil.which('restorecon'):
+ # If we don't have restorecon, failure is ignored quietly.
+ return
+
with subprocess.Popen(['restorecon', '-F', '-f-', '-0'],
stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) as proc:
out, err = proc.communicate(input=b'\0'.join(os.fsencode(f) for f in selinux_updates) + b'\0')