diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2018-05-15 17:13:09 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2018-05-16 06:44:16 +0200 |
| commit | 6341e5ce2365d791102505fe040d1dcba5b271aa (patch) | |
| tree | 1c9b04784f1ad0409ce084adb6e2ed5c6f1cc155 | |
| parent | 652438772e0b1a5bdc48699a9f72057ea377df3c (diff) | |
| download | pacman-6341e5ce2365d791102505fe040d1dcba5b271aa.tar.gz pacman-6341e5ce2365d791102505fe040d1dcba5b271aa.tar.xz | |
Fix using run_pacman to invoke -Qi with sudo
In commit 5698d7b66daa2a0bc99cab7a989cef1c806c3bf6 a new non-root use of
pacman was added -- previously we used -T or -Qq, and run_pacman did not
know how to special-case -Qi to skip being prepended with sudo.
The result is:
-> Generating .BUILDINFO file...
ERROR: ld.so: object 'libfakeroot.so' from LD_PRELOAD cannot be preloaded (cannot open shared object file): ignored.
[sudo] password for eschwartz:
-> Adding changelog file...
Fix this by using a more generic glob since neither -Q nor -T will ever
need sudo or PACMAN_OPTS
Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | scripts/makepkg.sh.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 62b912e3..e9080a70 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -220,12 +220,12 @@ missing_source_file() { run_pacman() { local cmd - if [[ $1 != -@(T|Qq) ]]; then + if [[ $1 != -@(T|Q)*([[:alpha:]]) ]]; then cmd=("$PACMAN_PATH" "${PACMAN_OPTS[@]}" "$@") else cmd=("$PACMAN_PATH" "$@") fi - if [[ $1 != -@(T|Qq|Q) ]]; then + if [[ $1 != -@(T|Q)*([[:alpha:]]) ]]; then if type -p sudo >/dev/null; then cmd=(sudo "${cmd[@]}") else |