diff mbox

[pacman-dev] makepkg --packagelist: fix listing debug packages with makepkg.conf

Message ID 20180315004705.26311-1-eschwartz@archlinux.org
State Accepted, archived
Headers show

Commit Message

Eli Schwartz March 15, 2018, 12:47 a.m. UTC
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>
---

This seems like a good idea, considering that --packagelist is meant to
be run in real world situations where makepkg.conf exists and is a
thing.

 scripts/libmakepkg/util/pkgbuild.sh.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
diff mbox

Patch

diff --git a/scripts/libmakepkg/util/pkgbuild.sh.in b/scripts/libmakepkg/util/pkgbuild.sh.in
index 6cfda0b3..b2684dde 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