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. Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
This commit is contained in:
parent
39a99e1664
commit
63ad548818
15
commitpkg.in
15
commitpkg.in
|
@ -96,6 +96,11 @@ for _arch in "${arch[@]}"; do
|
||||||
check_package_validity "$pkgfile"
|
check_package_validity "$pkgfile"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
fullver=$(get_full_version "$pkgbase")
|
||||||
|
if pkgfile=$(find_cached_package "$pkgbase-debug" "$fullver" "$_arch"); then
|
||||||
|
check_package_validity "$pkgfile"
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
if [[ -z $server ]]; then
|
if [[ -z $server ]]; then
|
||||||
|
@ -140,7 +145,6 @@ for _arch in "${arch[@]}"; do
|
||||||
|
|
||||||
for _pkgname in "${pkgname[@]}"; do
|
for _pkgname in "${pkgname[@]}"; do
|
||||||
fullver=$(get_full_version "$_pkgname")
|
fullver=$(get_full_version "$_pkgname")
|
||||||
|
|
||||||
if ! pkgfile=$(find_cached_package "$_pkgname" "$fullver" "${_arch}"); then
|
if ! pkgfile=$(find_cached_package "$_pkgname" "$fullver" "${_arch}"); then
|
||||||
warning "Skipping %s: failed to locate package file" "$_pkgname-$fullver-$_arch"
|
warning "Skipping %s: failed to locate package file" "$_pkgname-$fullver-$_arch"
|
||||||
skip_arches+=("$_arch")
|
skip_arches+=("$_arch")
|
||||||
|
@ -148,6 +152,15 @@ for _arch in "${arch[@]}"; do
|
||||||
fi
|
fi
|
||||||
uploads+=("$pkgfile")
|
uploads+=("$pkgfile")
|
||||||
done
|
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
|
done
|
||||||
|
|
||||||
for pkgfile in "${uploads[@]}"; do
|
for pkgfile in "${uploads[@]}"; do
|
||||||
|
|
Loading…
Reference in New Issue