Merge branch 'cleanup' into master-merge

Conflicts:
	config
	cron-jobs/sourceballs
	db-functions
	db-move
	db-remove
	db-update

1 files changed, 15 insertions, 17 deletions

diff --git a/testing2x b/testing2x
index 54cae11..14610c2 100755
--- a/testing2x
+++ b/testing2x
@@ -1,16 +1,16 @@
 #!/bin/bash
 
-. "$(dirname $0)/db-functions"
-. "$(dirname $0)/config"
+. "$(dirname "$(readlink -e "$0")")/config"
+. "$(dirname "$(readlink -e "$0")")/db-functions"
 
 if [ $# -lt 1 ]; then
-	msg "usage: $(basename $0) <pkgname|pkgbase> ..."
+	msg "usage: ${0##*/} <pkgname|pkgbase> ..."
 	exit 1
 fi
 
-# Lock everything to reduce  possibility of interfering task between the different repo-updates
+# 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 "${pkgbase} not found in [testing]"
+		${found_source} || die "${pkgbase} not found in [${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 "${pkgbase} neither found in [core] nor [extra]"
+		${found_target} || die "${pkgbase} not found in any of these repos: ${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 $0)/db-move" 'testing' "${repo}" ${pkgs[${repo}]}
+		"$(dirname $0)/db-move" ${TESTING_REPO} "${repo}" ${pkgs[${repo}]}
 	fi
 done