From c63aa0372b7acd8f6a094ca240eb39c8aab646cf Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Mon, 4 Sep 2017 14:13:05 +0530 Subject: install: Also ignore PermissionError for selinux When the user does not have permissions to run `selinuxenabled`, a PermissionError is raised instead of FileNotFoundError. Closes https://github.com/mesonbuild/meson/issues/2257 --- mesonbuild/scripts/meson_install.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesonbuild/scripts/meson_install.py b/mesonbuild/scripts/meson_install.py index b05ffbcad..f978be4ac 100644 --- a/mesonbuild/scripts/meson_install.py +++ b/mesonbuild/scripts/meson_install.py @@ -101,7 +101,7 @@ def restore_selinux_context(to_file): use_selinux = False msg = "{!r}: Failed to restore SELinux context, ignoring SELinux context for all remaining files..." print(msg.format(to_file, e.returncode)) - except (FileNotFoundError, subprocess.CalledProcessError) as e: + except (FileNotFoundError, PermissionError, subprocess.CalledProcessError) as e: # If we don't have selinux or selinuxenabled returned 1, failure # is ignored quietly. use_selinux = False -- cgit v1.2.3