summaryrefslogtreecommitdiffstats
path: root/scripts/libmakepkg
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2018-03-15 01:47:05 +0100
committerAllan McRae <allan@archlinux.org>2018-03-18 03:47:44 +0100
commit9ca88575e60adfb930ae2bf6e05f36cf40fdec21 (patch)
tree90ce9095883b4bb481a7481eb652c16b7d47c72a /scripts/libmakepkg
parent9e52a36794552b77ecf26f7f34b226d096978f1e (diff)
downloadpacman-9ca88575e60adfb930ae2bf6e05f36cf40fdec21.tar.gz
pacman-9ca88575e60adfb930ae2bf6e05f36cf40fdec21.tar.xz
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 <eschwartz@archlinux.org> Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts/libmakepkg')
-rw-r--r--scripts/libmakepkg/util/pkgbuild.sh.in3
1 files changed, 1 insertions, 2 deletions
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