Skip to content

Commit

Permalink
commitpkg: Implement debug package handling
Browse files Browse the repository at this point in the history
This implements the logic we need to properly figure out debug packages
when finding packages we are suppose to upload towards
repos.archlinux.org.
  • Loading branch information
Foxboron committed Jan 5, 2022
1 parent 5a9f0e2 commit 21856e6
Showing 1 changed file with 14 additions and 1 deletion.
15 changes: 14 additions & 1 deletion commitpkg.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -139,14 +144,22 @@ 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")
continue 2
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
Expand Down

0 comments on commit 21856e6

Please sign in to comment.