Giant SVN changes

Some other fun stuff snuck in there, like indentation changes,
but this should get us mostly working under SVN, and at least
allow us to build DB files at the very least

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>

1 files changed, 1 insertions, 49 deletions

diff --git a/db-testing b/db-testing
index 70451a2..15205a2 100755
--- a/db-testing
+++ b/db-testing
@@ -4,52 +4,4 @@ repoid=4
 reponame="testing"
 arch="i686"
 
-ftppath="/home/ftp/testing/os/i686"
-
-cvspath="/home/cvs-arch"
-cvsmod="testing"
-cvstag="TESTING"
-
-stagedir="$HOME/staging/testing"
-
-testing_cleanup() {
-	rm -rf $testingtmp
-}
-
-# catch ^C
-trap testing_cleanup SIGINT
-
-if [ -f /tmp/.repolck.$arch.$repoid ]; then
-	owner=`/bin/ls -l /tmp/.repolck.$arch.$repoid | awk '{print $3}'`
-	echo "error: db generation is already in progress (started by $owner)"
-	exit 1
-fi
-# lock
-touch /tmp/.repolck.$arch.$repoid
-
-# testing is special, so we have to do the CVS checkout stuff here
-testingtmp=$(mktemp -d /tmp/testtmp-XXXXXX) || exit 1
-cvsdir=$testingtmp/testing
-mkdir $cvsdir
-cd $cvsdir
-
-if [ "`ls $stagedir/add`" -o "`ls $stagedir/del`" ]; then
-	echo "==> Checking out TESTING branches..." >&2
-	echo "--- CORE ---"
-	CVS_RSH=ssh CVSROOT=:ext:cvs.archlinux.org:/home/cvs-core cvs -q export -r TESTING core
-	cp -a core/* . && rm -rf core
-	echo "--- EXTRA ---"
-	CVS_RSH=ssh CVSROOT=:ext:cvs.archlinux.org:/home/cvs-extra cvs -q export -r TESTING extra
-	cp -a extra/* . && rm -rf extra
-	echo "--- UNSTABLE ---"
-	CVS_RSH=ssh CVSROOT=:ext:cvs.archlinux.org:/home/cvs-unstable cvs -q export -r TESTING unstable
-	cp -a unstable/* . && rm -rf unstable
-fi
-
-# unlock
-rm -f /tmp/.repolck.$arch.$repoid
-
-# call the real script
-. `dirname $0`/db-inc
-
-testing_cleanup
+. $(dirname $0)/db-inc