Unverified Commit f2e8d57e authored by Eli Schwartz's avatar Eli Schwartz
Browse files

Handle split packages properly in staging repos check.

This needs to check the pkgbase, not the pkgname, as for split packages
we need to lookup a PKGBUILD using the basename.
parent 7a173f82
......@@ -380,15 +380,16 @@ check_pkgrepos() {
check_stagingrepos() {
local pkgfile=${1}
local pkgrepo=${2}
local pkgbase=$(getpkgbase "${pkgfile}")
local pkgname=$(getpkgname "${pkgfile}")
local pkgarch=$(getpkgarch "${pkgfile}")
local candidate candidates=()
if in_array "${pkgrepo}" "${STABLE_REPOS[@]}"; then
candidates+=($(find_repo_for_package "${pkgname}" "${pkgarch}" "${TESTING_REPOS[@]}"))
candidates+=($(find_repo_for_package "${pkgbase}" "${pkgarch}" "${TESTING_REPOS[@]}"))
fi
if in_array "${pkgrepo}" "${STABLE_REPOS[@]}" "${TESTING_REPOS[@]}"; then
candidates+=($(find_repo_for_package "${pkgname}" "${pkgarch}" "${STAGING_REPOS[@]}"))
candidates+=($(find_repo_for_package "${pkgbase}" "${pkgarch}" "${STAGING_REPOS[@]}"))
fi
(( ${#candidates[@]} == 0 )) && return 0
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment