8cbb08d8e5
host-meson is used by some packages such as libmpdclient. If selinuxenabled is installed on host but restorecon is unavailable (for an "unknwown" reason), install will crash. Fixes: - http://autobuild.buildroot.net/results/d5dcdfdfab3503fdc387f99e68267972a38c417d Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
From 8edc477b7d7b160004eb700a1b7523237333d9ec Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Tue, 13 Mar 2018 18:52:36 +0100
|
|
Subject: [PATCH] Fix FileNotFoundError when restorecon unavailable
|
|
|
|
Fixes:
|
|
- http://autobuild.buildroot.net/results/d5dcdfdfab3503fdc387f99e68267972a38c417d
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
---
|
|
mesonbuild/scripts/meson_install.py | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/mesonbuild/scripts/meson_install.py b/mesonbuild/scripts/meson_install.py
|
|
index f895f17d..1414ace2 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')
|
|
--
|
|
2.14.1
|
|
|