aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2023-02-07 20:52:57 -0500
committerEli Schwartz <eschwartz@archlinux.org>2023-02-20 19:54:38 -0500
commit7884149bf55dfef1fc77f404b8dbb08cd12e0908 (patch)
tree5d63cdf1f1149be389c58845148da44156b87f4f
parent088727164de8496c4bada040c2f4690e42f66b69 (diff)
downloadmeson-7884149bf55dfef1fc77f404b8dbb08cd12e0908.zip
meson-7884149bf55dfef1fc77f404b8dbb08cd12e0908.tar.gz
meson-7884149bf55dfef1fc77f404b8dbb08cd12e0908.tar.bz2
minstall: when elevating to root, don't allow ninja to rerun
We just finished running rebuild_all, and then actually running the install routine failed because of permission errors, so we magically reran as root. But we should *know* that all prerequisite targets are up to date already, we don't need to run it *again*. Nevertheless, when running meson install directly we could end up without --no-rebuild in the original argv. This meant that it wouldn't be in the re-executed argv either. Add it on just in case -- repeating it twice doesn't hurt anyway.
-rw-r--r--mesonbuild/minstall.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py
index 40c2d2d..9ba36cb 100644
--- a/mesonbuild/minstall.py
+++ b/mesonbuild/minstall.py
@@ -560,7 +560,7 @@ class Installer:
print('Installation failed due to insufficient permissions.')
print('Attempting to use polkit to gain elevated privileges...')
os.execlp('pkexec', 'pkexec', sys.executable, main_file, *sys.argv[1:],
- '-C', os.getcwd())
+ '-C', os.getcwd(), '--no-rebuild')
else:
raise