diff options
Diffstat (limited to 'testing2x')
| -rwxr-xr-x | testing2x | 24 |
1 files changed, 11 insertions, 13 deletions
@@ -10,7 +10,7 @@ fi # Lock everything to reduce possibility of interfering task between the different repo-updates script_lock -for repo in 'core' 'extra' 'testing'; do +for repo in "${TESTING_REPO}" "${STABLE_REPOS[@]}"; do for pkgarch in "${ARCHES[@]}"; do repo_lock "${repo}" "${pkgarch}" || exit 1 done @@ -20,41 +20,39 @@ declare -A pkgs for pkgbase in "$@"; do if [ ! -d "${WORKDIR}/${pkgbase}" ]; then - /usr/bin/svn export -q "${SVNREPO}/${pkgbase}/repos" "${WORKDIR}/${pkgbase}" >/dev/null - found_source=false for pkgarch in "${ARCHES[@]}" 'any'; do - svnrepo_from="${WORKDIR}/${pkgbase}/testing-${pkgarch}" - if [ -r "${svnrepo_from}/PKGBUILD" ]; then + xbsrepo_from="$(xbs releasepath "${pkgbase}" "${TESTING_REPO}" "${pkgarch}")" + if [ -r "${xbsrepo_from}/PKGBUILD" ]; then found_source=true break fi done - "${found_source}" || die "%s not found in [testing]" "${pkgbase}" + "${found_source}" || die "%s not found in [%s]" "${pkgbase}" "${TESTING_REPO}" found_target=false for pkgarch in "${ARCHES[@]}" 'any'; do - for repo in 'core' 'extra'; do - svnrepo_to="${WORKDIR}/${pkgbase}/${repo}-${pkgarch}" - if [ -r "${svnrepo_to}/PKGBUILD" ]; then + for repo in "${STABLE_REPOS[@]}"; do + xbsrepo_to="$(xbs releasepath "${pkgbase}" "${repo}" "${pkgarch}")" + if [ -r "${xbsrepo_to}/PKGBUILD" ]; then found_target=true pkgs[${repo}]+="${pkgbase} " break 2 fi done done - "${found_target}" || die "%s neither found in [core] nor [extra]" "${pkgbase}" + "${found_target}" || die "%s not found in any of these repos: %s" "${pkgbase}" "${STABLE_REPOS[*]}" fi done for pkgarch in "${ARCHES[@]}"; do - repo_unlock 'testing' "${pkgarch}" + repo_unlock "${TESTING_REPO}" "${pkgarch}" done -for repo in 'core' 'extra'; do +for repo in "${STABLE_REPOS[@]}"; do for pkgarch in "${ARCHES[@]}"; do repo_unlock "${repo}" "${pkgarch}" done if [ -n "${pkgs[${repo}]}" ]; then - "$(dirname "$(readlink -e "$0")")/db-move" 'testing' "${repo}" ${pkgs[${repo}]} + "$(dirname "$(readlink -e "$0")")/db-move" ${TESTING_REPO} "${repo}" ${pkgs[${repo}]} fi done |