From 0d6e82d3748653a2b61ea34b940011ef97350768 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Thu, 14 Jun 2018 22:25:25 -0400 Subject: makepkg: don't print per-pkgname debug packages 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: Allan McRae --- scripts/libmakepkg/util/pkgbuild.sh.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/libmakepkg/util/pkgbuild.sh.in b/scripts/libmakepkg/util/pkgbuild.sh.in index 3f8669ab..c6f8a82d 100644 --- a/scripts/libmakepkg/util/pkgbuild.sh.in +++ b/scripts/libmakepkg/util/pkgbuild.sh.in @@ -188,10 +188,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 done + 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() { -- cgit v1.2.3-24-g4f1b