From 14da4f85504447bcd3738ea563088411d49fd07f Mon Sep 17 00:00:00 2001 From: Morten Linderud Date: Sat, 25 Dec 2021 15:06:35 +0100 Subject: [PATCH] commitpkg: Implement debug package handling This implements the logic we need to properly figure out debug packages when finding packages we are suppose to upload towards repos.archlinux.org. --- commitpkg.in | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/commitpkg.in b/commitpkg.in index 74d69cc3..1a48aa2f 100644 --- a/commitpkg.in +++ b/commitpkg.in @@ -95,6 +95,11 @@ for _arch in "${arch[@]}"; do check_package_validity "$pkgfile" fi done + + fullver=$(get_full_version "$pkgbase") + if pkgfile=$(find_cached_package "$pkgbase-debug" "$fullver" "$_arch"); then + check_package_validity "$pkgfile" + fi done if [[ -z $server ]]; then @@ -139,7 +144,6 @@ for _arch in "${arch[@]}"; do for _pkgname in "${pkgname[@]}"; do fullver=$(get_full_version "$_pkgname") - if ! pkgfile=$(find_cached_package "$_pkgname" "$fullver" "${_arch}"); then warning "Skipping %s: failed to locate package file" "$_pkgname-$fullver-$_arch" skip_arches+=("$_arch") @@ -147,6 +151,15 @@ for _arch in "${arch[@]}"; do fi uploads+=("$pkgfile") done + + fullver=$(get_full_version "$pkgbase") + if ! pkgfile=$(find_cached_package "$pkgbase-debug" "$fullver" "$_arch"); then + continue + fi + if ! is_debug_package "$pkgfile"; then + continue + fi + uploads+=("$pkgfile") done for pkgfile in "${uploads[@]}"; do