diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2018-06-15 04:25:25 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2018-06-18 08:54:37 +0200 |
| commit | 0d6e82d3748653a2b61ea34b940011ef97350768 (patch) | |
| tree | 8e2521b9c3bdc631125d3dbb50721bfc70806a0c | |
| parent | d750c854bcfa2461742a4d5dff7b4747db5c1f53 (diff) | |
| download | pacman-0d6e82d3748653a2b61ea34b940011ef97350768.tar.gz pacman-0d6e82d3748653a2b61ea34b940011ef97350768.tar.xz | |
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 <allan@archlinux.org>
| -rw-r--r-- | scripts/libmakepkg/util/pkgbuild.sh.in | 7 |
1 files 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() { |