From f6f4da26cbe57c1c64ca11ce960277942148135b Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Thu, 28 Mar 2019 19:41:30 -0400 Subject: [PATCH] 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 Signed-off-by: Levente Polyak --- makechrootpkg.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/makechrootpkg.in b/makechrootpkg.in index 409f0e7..c33ff8a 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -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 ;;