use xbs, not svn

1 files changed, 11 insertions, 38 deletions

diff --git a/db-functions b/db-functions
index 523e872..c98b26f 100644
--- a/db-functions
+++ b/db-functions
@@ -17,11 +17,6 @@ restore_umask () {
 
 # set up general environment
 WORKDIR=$(mktemp -dt "${0##*/}.XXXXXXXXXX")
-if [ -n "${SVNUSER}" ]; then
-	setfacl -m u:"${SVNUSER}":rwx "${WORKDIR}"
-	setfacl -m d:u:"${USER}":rwx "${WORKDIR}"
-	setfacl -m d:u:"${SVNUSER}":rwx "${WORKDIR}"
-fi
 LOCKS=()
 
 # Used: plain, msg, msg2, warning, error, in_array
@@ -292,7 +287,7 @@ check_pkgfile() {
 	fi
 }
 
-check_pkgsvn() {
+check_pkgxbs() {
 	local pkgfile="${1}"
 	local _pkgbase="$(getpkgbase ${pkgfile})"
 	[ $? -ge 1 ] && return 1
@@ -306,18 +301,11 @@ check_pkgsvn() {
 
 	in_array "${repo}" ${PKGREPOS[@]} || return 1
 
-	if [ ! -f "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}" ]; then
-		mkdir -p "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}"
-		arch_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}"; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel}) )"
-	[ "${svnver}" == "${_pkgver}" ] || return 1
+	local xbsver="$(. "`xbs releasepath ${_pkgbase} ${repo} ${_pkgarch}`/PKGBUILD"; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel}) )"
+	[ "${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
 }
@@ -328,7 +316,7 @@ check_splitpkgs() {
 	local pkgfiles=(${@})
 	local pkgfile
 	local pkgdir
-	local svnname
+	local xbsname
 
 	mkdir -p "${WORKDIR}/check_splitpkgs/"
 	pushd "${WORKDIR}/check_splitpkgs" >/dev/null
@@ -341,16 +329,9 @@ 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}"
-			arch_svn export -q "${SVNREPO}/${_pkgbase}/repos/${repo}-${_pkgarch}/PKGBUILD" \
-				"${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}" >/dev/null
-			[ $? -ge 1 ] && return 1
-		fi
-
-		local svnnames=($(. "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}"; echo ${pkgname[@]}))
-		for svnname in ${svnnames[@]}; do
-			echo "${svnname}" >> "${repo}/${_pkgarch}/${_pkgbase}/svn"
+		local xbsnames=($(. "`xbs releasepath ${_pkgbase} ${repo} ${_pkgarch}`/PKGBUILD"; echo ${pkgname[@]}))
+		for xbsname in ${xbsnames[@]}; do
+			echo "${xbsname}" >> "${repo}/${_pkgarch}/${_pkgbase}/xbs"
 		done
 	done
 	popd >/dev/null
@@ -358,8 +339,8 @@ check_splitpkgs() {
 	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
@@ -465,11 +446,3 @@ arch_repo_remove() {
 		|| error "repo-remove ${filesfile} ${pkgs[@]}"
 	set_repo_permission "${repo}" "${arch}"
 }
-
-arch_svn() {
-	if [ -z "${SVNUSER}" ]; then
-		/usr/bin/svn "${@}"
-	else
-		sudo -u "${SVNUSER}" -- /usr/bin/svn --username "${USER}" "${@}"
-	fi
-}