Use XBS instead of the SVN/ABS grossness.

* config: drop SVNREPO
* cron-jobs/sourceballs: Replace commented out SVN code and active ABS code
  with XBS code.  The XBS code is fairly similar to the SVN code, the
  difference being that it uses `xbs releasepath` instead of `svn export`.
* db-functions:
  - Rename check_pkgsvn to check_pkgxbs
  - check_pkgxbs: Drop the `svn export` bit, as `xbs releasepath` assumes
    that a working directory already exists.  Replace the paths created by
    the `svn export` with calls to `xbs releasepath`.
  - check_splitpkgs: Drop the ABS `cp` -r bit, as `xbs releasepath` assumes
    that a working directory already exists.  Replace the paths created by
    the `cp -r` with calls to `xbs releasepath`.  Rename the variables and
    temporary files s/svn/xbs/ .
* db-move:
  - First loop: Rename the variable svnrepo_from to xbsrepo_from, and get
    the value from `xbs releasepath`.
  - Second loop: Run `xbs move` before the inner loop to get a list of
    architectures. Rename the variable `svnrepo_from` to `xbsrepo_to`, and
    get the value for it from `xbs releasepath`.  Because xbs guarantees
    that the PKGBUILD exists for the architectures listed, replace the
    check for whether the PKGBUILD exists with `if true`, to keep merging
    easy (as opposed to removing the if, and de-indenting the whole thing).
* db-remove: Get the location of the PKGBUILD from `xbs releasepath`, call
  `xbs unrelease`, and adjust a message to use `xbs name` and mention the
  appropriate repo/arch pair.

5 files changed, 30 insertions, 51 deletions

diff --git a/config b/config
index ec732c8..f1b09eb 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #!/hint/bash
+
 FTP_BASE="/srv/repo/main"
-SVNREPO="/var/abs"
 
 # Repos from Arch
 ARCHREPOS=('core' 'testing' 'extra' 'community' 'multilib' 'multilib-testing')
diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index a9addc3..c12a128 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -78,15 +78,10 @@ for repo in "${PKGREPOS[@]}"; do
 				continue
 			fi
 
-			# Get the sources from svn
+			# Get the sources from xbs
 			mkdir -p -m0770 "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}"
-			#svn export -q "${SVNREPO}/${pkgbase}/repos/${repo}-${pkgarch}" \
-			#	"${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/${pkgbase}" >/dev/null 2>&1
-
-			# If it's on official repos, nor [libre], nor [libre-testing]
-			cp -r "${SVNREPO}/$repo/${pkgbase}" "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/" >/dev/null 2>&1 || \
-				cp -r "${SVNREPO}/libre/${pkgbase}" "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/" >/dev/null 2>&1 || \
-				cp -r "${SVNREPO}/libre-testing/${pkgbase}" "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/" >/dev/null 2>&1
+			cp -a "$(xbs releasepath "${pkgbase}" "${repo}" "${pkgarch}")" \
+				"${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/${pkgbase}" >/dev/null 2>&1
 			if [ $? -ge 1 ]; then
 				failedpkgs+=("${pkgbase}-${pkgver}${SRCEXT}")
 				continue
diff --git a/db-functions b/db-functions
index deaa008..d76aa41 100644
--- a/db-functions
+++ b/db-functions
@@ -347,7 +347,7 @@ check_pkgfile() {
 	fi
 }
 
-check_pkgsvn() {
+check_pkgxbs() {
 	local pkgfile="${1}"
 	local _pkgbase="$(getpkgbase "${pkgfile}")"
 	[ $? -ge 1 ] && return 1
@@ -361,18 +361,11 @@ check_pkgsvn() {
 
 	in_array "${repo}" "${PKGREPOS[@]}" || return 1
 
-	if [ ! -f "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}" ]; then
-		mkdir -p "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}"
-		svn export -q "${SVNREPO}/${_pkgbase}/repos/${repo}-${_pkgarch}/PKGBUILD" \
-			"${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}" >/dev/null
-		[ $? -ge 1 ] && return 1
-	fi
-
-	local svnver="$(. "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}"; get_full_version "${epoch:-0}" "${pkgver}" "${pkgrel}")"
-	[ "${svnver}" == "${_pkgver}" ] || return 1
+	local xbsver="$(. "$(xbs releasepath "${_pkgbase}" "${repo}" "${_pkgarch}")/PKGBUILD"; get_full_version "${_pkgname}")"
+	[ "${xbsver}" == "${_pkgver}" ] || return 1
 
-	local svnnames=($(. "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}"; echo "${pkgname[@]}"))
-	in_array "${_pkgname}" "${svnnames[@]}" || return 1
+	local xbsnames=($(. "$(xbs releasepath "${_pkgbase}" "${repo}" "${_pkgarch}")/PKGBUILD"; echo "${pkgname[@]}"))
+	in_array "${_pkgname}" "${xbsnames[@]}" || return 1
 
 	return 0
 }
@@ -383,7 +376,7 @@ check_splitpkgs() {
 	local pkgfiles=("${@}")
 	local pkgfile
 	local pkgdir
-	local svnname
+	local xbsname
 
 	mkdir -p "${WORKDIR}/check_splitpkgs/"
 	pushd "${WORKDIR}/check_splitpkgs" >/dev/null
@@ -397,29 +390,16 @@ check_splitpkgs() {
 		mkdir -p "${repo}/${_pkgarch}/${_pkgbase}"
 		echo "${_pkgname}" >> "${repo}/${_pkgarch}/${_pkgbase}/staging"
 
-		if [ ! -f "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}" ]; then
-			mkdir -p "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}"
-
-			cp -r "${SVNREPO}/$repo/$_pkgbase/PKGBUILD" "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}" >/dev/null 2>&1 || \
-				cp -r "${SVNREPO}/libre/$_pkgbase/PKGBUILD" "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}" >/dev/null 2>&1 || \
-				cp -r "${SVNREPO}/libre-testing/$_pkgbase/PKGBUILD" "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/$_pkgbase">/dev/null 2>&1
-
-			[[ $? -ge 1 ]] && {
-				echo "Failed $_pkgbase-$_pkgver-$_pkgarch"
-				return 1
-			}
-		fi
-
-		local svnnames=($(. "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}"; echo "${pkgname[@]}"))
-		printf '%s\n' "${svnnames[@]}" >> "${repo}/${_pkgarch}/${_pkgbase}/svn"
+		local xbsnames=($(. "$(xbs releasepath "${_pkgbase}" "${repo}" "${_pkgarch}")/PKGBUILD"; echo "${pkgname[@]}"))
+		printf '%s\n' "${xbsnames[@]}" >> "${repo}/${_pkgarch}/${_pkgbase}/xbs"
 	done
 	popd >/dev/null
 
 	for pkgdir in "${WORKDIR}/check_splitpkgs/${repo}"/*/*; do
 		[ ! -d "${pkgdir}" ] && continue
 		sort -u "${pkgdir}/staging" -o "${pkgdir}/staging"
-		sort -u "${pkgdir}/svn" -o "${pkgdir}/svn"
-		if [ ! -z "$(comm -13 "${pkgdir}/staging" "${pkgdir}/svn")" ]; then
+		sort -u "${pkgdir}/xbs" -o "${pkgdir}/xbs"
+		if [ ! -z "$(comm -13 "${pkgdir}/staging" "${pkgdir}/xbs")" ]; then
 			return 1
 		fi
 	done
diff --git a/db-move b/db-move
index 2ac3f4a..275a11a 100755
--- a/db-move
+++ b/db-move
@@ -27,14 +27,14 @@ done
 # First loop is to check that all necessary files exist
 for pkgbase in "${args[@]:2}"; do
 	for pkgarch in "${ARCHES[@]}" 'any'; do
-		svnrepo_from="${SVNREPO}/${repo_from}/${pkgbase}"
-		if [ -r "${svnrepo_from}/PKGBUILD" ]; then
-			pkgnames=($(. "${svnrepo_from}/PKGBUILD"; echo "${pkgname[@]}"))
+		xbsrepo_from="$(xbs releasepath "${pkgbase}" "${repo_from}" "${pkgarch}")"
+		if [ -r "${xbsrepo_from}/PKGBUILD" ]; then
+			pkgnames=($(. "${xbsrepo_from}/PKGBUILD"; echo "${pkgname[@]}"))
 			if [ ${#pkgnames[@]} -lt 1 ]; then
 				die "Could not read pkgname"
 			fi
 
-			pkgver=$(. "${svnrepo_from}/PKGBUILD"; get_full_version "${epoch:-0}" "${pkgver}" "${pkgrel}")
+			pkgver=$(. "${xbsrepo_from}/PKGBUILD"; get_full_version "${epoch:-0}" "${pkgver}" "${pkgrel}")
 			if [ -z "${pkgver}" ]; then
 				die "Could not read pkgver"
 			fi
@@ -61,18 +61,20 @@ msg "Moving packages from [%s] to [%s]..." "${repo_from}" "${repo_to}"
 declare -A add_pkgs
 declare -A remove_pkgs
 for pkgbase in "${args[@]:2}"; do
-	for pkgarch in "${ARCHES[@]}" 'any'; do
-		svnrepo_from="${SVNREPO}/${repo_from}/${pkgbase}"
-
-		if [ -f "${svnrepo_from}/PKGBUILD" ]; then
+	# move the package in xbs
+	arches=($(xbs move "${repo_from}" "${repo_to}" "${pkgbase}"))
+	# move the package in ftp
+	for pkgarch in "${arches[@]}"; do
+		xbsrepo_to="$(xbs releasepath "$pkgbase" "$repo_to" "$pkgarch")"
+		if true; then # to add an indent level to make merging easier
 			if [ "${pkgarch}" == 'any' ]; then
 				tarches=("${ARCHES[@]}")
 			else
 				tarches=("${pkgarch}")
 			fi
 			msg2 '%s (%s)' "${pkgbase}" "${tarches[*]}"
-			pkgnames=($(. "${svnrepo_from}/PKGBUILD"; echo "${pkgname[@]}"))
-			pkgver=$(. "${svnrepo_from}/PKGBUILD"; get_full_version "${epoch:-0}" "${pkgver}" "${pkgrel}")
+			pkgnames=($(. "${xbsrepo_to}/PKGBUILD"; echo "${pkgname[@]}"))
+			pkgver=$(. "${xbsrepo_to}/PKGBUILD"; get_full_version "${epoch:-0}" "${pkgver}" "${pkgrel}")
 
 			for pkgname in "${pkgnames[@]}"; do
 				for tarch in "${tarches[@]}"; do
diff --git a/db-remove b/db-remove
index 53fdb2a..dcbe4b4 100755
--- a/db-remove
+++ b/db-remove
@@ -30,11 +30,13 @@ remove_pkgs=()
 for pkgbase in "${pkgbases[@]}"; do
 	msg "Removing %s from [%s]..." "$pkgbase" "$repo"
 
-	path="${SVNREPO}/$repo/$pkgbase"
+	path="$(xbs releasepath "$pkgbase" "$repo" "$arch")"
 	if [ -d "$path" ]; then
 		remove_pkgs+=($(. "$path/PKGBUILD"; echo "${pkgname[@]}"))
+		xbs unrelease "$pkgbase" "$repo" "$arch"
 	else
-		warning "%s not found in ABS(libre)" "$pkgbase"
+		warning "%s not found in %s for %s" \
+			"$pkgbase" "$(xbs name)" "$repo-$arch"
 		warning "Removing only %s from the repo" "$pkgbase"
 		warning "If it was a split package you have to remove the others yourself!"
 		remove_pkgs+=("$pkgbase")