makechrootpkg: fix breakage in makepkg option parsing
In commit bd826752c9
, 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>
This commit is contained in:
parent
40a90e2cab
commit
f6f4da26cb
|
@ -325,9 +325,8 @@ 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 ;;
|
||||
|
|
Loading…
Reference in New Issue