bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix using run_pacman to invoke -Qi with sudo

Browse source 
In commit 5698d7b66d 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>
This commit is contained in:
Eli Schwartz 2018-05-15 11:13:09 -04:00 • committed by Allan McRae
parent 652438772e
commit 6341e5ce23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/makepkg.sh.in
View file

@ -220,12 +220,12 @@ missing_source_file() {
run_pacman() { run_pacman() {
local cmd local cmd
if [[ $1 != -@(T|Qq) ]]; then if [[ $1 != -@(T|Q)*([[:alpha:]]) ]]; then
cmd=("$PACMAN_PATH" "${PACMAN_OPTS[@]}" "$@") cmd=("$PACMAN_PATH" "${PACMAN_OPTS[@]}" "$@")
else else
cmd=("$PACMAN_PATH" "$@") cmd=("$PACMAN_PATH" "$@")
fi fi
if [[ $1 != -@(T|Qq|Q) ]]; then if [[ $1 != -@(T|Q)*([[:alpha:]]) ]]; then
if type -p sudo >/dev/null; then if type -p sudo >/dev/null; then
cmd=(sudo "${cmd[@]}") cmd=(sudo "${cmd[@]}")
else else