From 9ca88575e60adfb930ae2bf6e05f36cf40fdec21 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Wed, 14 Mar 2018 20:47:05 -0400 Subject: makepkg --packagelist: fix listing debug packages with makepkg.conf print_all_package_names used in_opt_array to check whether or not the PKGBUILD itself has options=('debug' 'split') -- while checking to see if it was enabled per split package which doesn't make sense as these options apply globally. This prevented debug packages from being listed if enabled via makepkg.conf rather than per PKGBUILD. Instead, use check_option to determine whether makepkg actually thinks it is meant to try creating a split debug package. Signed-off-by: Eli Schwartz Signed-off-by: Allan McRae --- scripts/libmakepkg/util/pkgbuild.sh.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'scripts/libmakepkg') diff --git a/scripts/libmakepkg/util/pkgbuild.sh.in b/scripts/libmakepkg/util/pkgbuild.sh.in index dcfc6264..25ad03ce 100644 --- a/scripts/libmakepkg/util/pkgbuild.sh.in +++ b/scripts/libmakepkg/util/pkgbuild.sh.in @@ -150,9 +150,8 @@ print_all_package_names() { local architecture pkg opts a for pkg in ${pkgname[@]}; do architecture=$(get_pkg_arch $pkg) - get_pkgbuild_attribute "$pkg" 'options' 1 opts printf "%s/%s-%s-%s%s\n" "$PKGDEST" "$pkg" "$version" "$architecture" "$PKGEXT" - if in_opt_array "debug" ${opts[@]} && in_opt_array "strip" ${opts[@]}; then + if check_option "debug" "y" && check_option "strip" "y"; then printf "%s/%s-%s-%s-%s%s\n" "$PKGDEST" "$pkg" "@DEBUGSUFFIX@" "$version" "$architecture" "$PKGEXT" fi done -- cgit v1.2.3-70-g09d2