diff mbox

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

Message ID 20180618032121.2463-1-eschwartz@archlinux.org
State Superseded, archived
Headers show

Commit Message

Eli Schwartz June 18, 2018, 3:21 a.m. UTC
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.

Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
---
 scripts/libmakepkg/util/pkgbuild.sh.in | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)
diff mbox

Patch

diff --git a/scripts/libmakepkg/util/pkgbuild.sh.in b/scripts/libmakepkg/util/pkgbuild.sh.in
index c2e2c536..44ba040a 100644
--- a/scripts/libmakepkg/util/pkgbuild.sh.in
+++ b/scripts/libmakepkg/util/pkgbuild.sh.in
@@ -189,11 +189,18 @@  print_all_package_names() {
 		fi
 		for a in "${architecture[@]}"; do
 			printf "%s/%s-%s-%s%s\n" "$PKGDEST" "$pkg" "$version" "$a" "$PKGEXT"
-			if check_option "debug" "y" && check_option "strip" "y"; then
-				printf "%s/%s-%s-%s-%s%s\n" "$PKGDEST" "$pkg" "@DEBUGSUFFIX@" "$version" "$a" "$PKGEXT"
-			fi
 		done
 	done
+	if check_option "debug" "y" && check_option "strip" "y"; then
+		if (( IGNOREARCH )); then
+			get_pkgbuild_attribute '' 'arch' 1 architecture
+		else
+			architecture=$(get_pkg_arch)
+		fi
+		for a in "${architecture[@]}"; do
+			printf "%s/%s-%s-%s-%s%s\n" "$PKGDEST" "$pkgbase" "@DEBUGSUFFIX@" "$version" "$a" "$PKGEXT"
+		done
+	fi
 }
 
 get_all_sources() {