From 17a94df0c108f09cada98535138136779b4e13a4 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Sun, 24 May 2015 12:41:09 -0600
Subject: 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.
---
 db-functions | 40 ++++++++++------------------------------
 1 file changed, 10 insertions(+), 30 deletions(-)

(limited to 'db-functions')

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
-- 
cgit v1.2.3