summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2019-03-29 00:41:30 +0100
committerLevente Polyak <anthraxx@archlinux.org>2019-08-09 19:41:52 +0200
commitf6f4da26cbe57c1c64ca11ce960277942148135b (patch)
tree6bd1e9c9e76ed86838d31d597ee7b528f0cc6a83
parent40a90e2cab479cc64903a62b42eb617a8a7e5842 (diff)
downloaddevtools-f6f4da26cbe57c1c64ca11ce960277942148135b.tar.gz
devtools-f6f4da26cbe57c1c64ca11ce960277942148135b.tar.xz
makechrootpkg: fix breakage in makepkg option parsing
In commit bd826752c9dc8f01917ee831302b6220ad09603a, support for short options was added to the heuristic for --noextract, but in the process, we changed to loop over the set of user options plus the builtin defaults for inside the chroot. This was wrong, as we only care about the user options -- moreover, it prevents us from adding verifysource support *outside* the chroot, for options that are also chroot options, like --holdver. Also remove uselessly duplicated line. Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
-rw-r--r--makechrootpkg.in3
1 files changed, 1 insertions, 2 deletions
diff --git a/makechrootpkg.in b/makechrootpkg.in
index 409f0e7..c33ff8a 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -325,10 +325,9 @@ fi
makepkg_args+=("${@:$OPTIND}")
# See if -R or -e was passed to makepkg
-for arg in "${makepkg_args[@]}"; do
+for arg in "${@:$OPTIND}"; do
case ${arg%%=*} in
--repackage|--noextract) keepbuilddir=1; break ;;
- --repackage|--noextract) keepbuilddir=1; break ;;
--*) ;;
-*R*|-*e*) keepbuilddir=1; break ;;
esac