diff mbox

[pacman-dev,v2] makepkg: don't print per-pkgname debug packages

Message ID 20180618065441.18994-1-allan@archlinux.org
State Accepted, archived
Headers show

Commit Message

Allan McRae June 18, 2018, 6:54 a.m. UTC
From: Eli Schwartz <eschwartz@archlinux.org>

In commit 9a4d61622066d5d30c649f1c958b26526a4ceddf debug packages were
merged into one exclusive pkgbase-debug, but the print_all_package_names
function did not get updated to match this logic.

This is a reduced patch of what was sent to the list earlier, now suitable
for included in 5.1.1.

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


diff --git a/scripts/libmakepkg/util/pkgbuild.sh.in b/scripts/libmakepkg/util/pkgbuild.sh.in
index 10d154d1..4b4b38e0 100644
--- a/scripts/libmakepkg/util/pkgbuild.sh.in
+++ b/scripts/libmakepkg/util/pkgbuild.sh.in
@@ -184,10 +184,11 @@  print_all_package_names() {
 	for pkg in ${pkgname[@]}; do
 		architecture=$(get_pkg_arch $pkg)
 		printf "%s/%s-%s-%s%s\n" "$PKGDEST" "$pkg" "$version" "$architecture" "$PKGEXT"
-		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
+	if check_option "debug" "y" && check_option "strip" "y"; then
+		architecture=$(get_pkg_arch)
+		printf "%s/%s-%s-%s-%s%s\n" "$PKGDEST" "$pkgbase" "@DEBUGSUFFIX@" "$version" "$architecture" "$PKGEXT"
+	fi
 get_all_sources() {