diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-09-04 14:13:05 +0530 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-09-04 19:24:31 +0300 |
| commit | c63aa0372b7acd8f6a094ca240eb39c8aab646cf (patch) | |
| tree | 0e5213780bd59ec19bdea59799cadd04183e8719 | |
| parent | c9d97a58c511583f525b3a38d0296f2986d04b0c (diff) | |
| download | meson-c63aa0372b7acd8f6a094ca240eb39c8aab646cf.zip meson-c63aa0372b7acd8f6a094ca240eb39c8aab646cf.tar.gz meson-c63aa0372b7acd8f6a094ca240eb39c8aab646cf.tar.bz2 | |
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
| -rw-r--r-- | mesonbuild/scripts/meson_install.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/scripts/meson_install.py b/mesonbuild/scripts/meson_install.py index b05ffbc..f978be4 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 |