From 01a1eedbdb93a0c7312af1543658997ae7aa680c Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaronmgriffin@gmail.com>
Date: Wed, 14 May 2008 15:07:37 -0400
Subject: Add new db-remove script

This script deletes by package NAME only. Additionally, it
also removes from svn. The goal is to simplify the process
of removing packages.

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
---
 db-remove | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100755 db-remove

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
new file mode 100755
index 0000000..c69e179
--- /dev/null
+++ b/db-remove
@@ -0,0 +1,97 @@
+#!/bin/bash
+
+if [ $# -ne 3 ]; then
+	echo "usage: $(basename $0) <pkgname> <arch> <reponame>"
+	exit 1
+fi
+
+if [ -f "/etc/makepkg.conf" ]; then
+	#Get some config info
+	. /etc/makepkg.conf
+else
+	echo "/etc/makepkg.conf does not exist!"
+	exit 1
+fi
+
+packagename="$1"
+reponame="$2"
+arch="$3"
+
+export CARCH="$arch"
+
+##### Arch specific stuff. TODO make this configurable #####
+ftppath="/home/ftp/$reponame/os/$arch/"
+svnpath="file:///home/svn-packages"
+svnrepo="$reponame-$arch"
+############################################################
+
+[ "$UID" = "" ] && UID=$(uid)
+
+WORKDIR="/tmp/db-remove.$svnrepo.$UID"
+LOCKFILE="/tmp/.repolck.$arch.$reponame"
+
+cleanup() {
+	# unlock
+	rm -f "$LOCKFILE"
+	rm -rf "$WORKDIR"
+	[ "$1" ] && exit $1
+}
+
+ctrl_c() {
+	echo "Interrupted" >&2
+	cleanup 0
+}
+
+die() {
+	echo "$*" >&2
+	cleanup 1
+}
+
+# check for locks
+if [ -f "$LOCKFILE" ]; then
+	owner="$(/usr/bin/stat -c %U $LOCKFILE)"
+	echo "error: db generation is already in progress (started by $owner)"
+	exit 1
+fi
+
+trap ctrl_c 2
+trap cleanup 0
+
+/bin/touch "$LOCKFILE"
+/bin/mkdir -p "$WORKDIR"
+
+
+echo "==> Removing package '$packagename' from '$reponame'..." >&2
+
+cd "$WORKDIR"
+/usr/bin/svn checkout -N $svnpath checkout
+cd checkout
+
+/usr/bin/svn up -q $packagename
+if [ -d "$packagename/repos/$svnrepo" ]; then
+	echo "    Removing from subversion"
+	/usr/bin/svn rm --force -q "$packagename/repos/$svnrepo"
+	/usr/bin/svn commit -q -m "$(basename $0): $packagename removed by $(id -un)"
+fi
+
+cd "$WORKDIR"
+[ -d build/ ] || mkdir build
+
+# copy the db file into our working area
+if [ -f "$ftppath/$reponame.db.tar.$DB_COMPRESSION" ]; then
+	cp "$ftppath/$reponame.db.tar.$DB_COMPRESSION" build/
+else
+	echo "No database found at '$ftpdir', nothing more to do"
+	exit 0
+fi
+
+echo "    Removing from $reponame DB file"
+cd build/
+/usr/bin/repo-remove "$reponame.db.tar.$DB_COMPRESSION" $packagename
+
+cp "$reponame.db.tar.$DB_COMPRESSION" "$ftppath/"
+
+echo "Package files will be cleaned up automatically"
+
+cleanup
+# vim: set ts=4 sw=4 noet ft=sh:
-- 
cgit v1.2.3-2-g168b


From a0c4daf2679a56f6eaa7df0062c7184fc55f95bf Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaronmgriffin@gmail.com>
Date: Thu, 22 May 2008 12:52:53 -0400
Subject: Fix db-remove usage text

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
---
 db-remove | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index c69e179..f9495e9 100755
--- a/db-remove
+++ b/db-remove
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [ $# -ne 3 ]; then
-	echo "usage: $(basename $0) <pkgname> <arch> <reponame>"
+	echo "usage: $(basename $0) <pkgname> <reponame> <arch>"
 	exit 1
 fi
 
-- 
cgit v1.2.3-2-g168b


From afc6b5b5977fe77e699af8f02f7c8c4c3df603de Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaronmgriffin@gmail.com>
Date: Sat, 30 Aug 2008 21:21:43 -0500
Subject: Create a "common functions" file for DB scripts

Common functions, such as sourcing makepkg, and locking a repo

Additionally, repo-locking has been unified to prevent multiple
users from corrupting a repo (i.e. db-move run while db-remove
in progress)

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
---
 db-remove | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index f9495e9..f4d9419 100755
--- a/db-remove
+++ b/db-remove
@@ -5,13 +5,9 @@ if [ $# -ne 3 ]; then
 	exit 1
 fi
 
-if [ -f "/etc/makepkg.conf" ]; then
-	#Get some config info
-	. /etc/makepkg.conf
-else
-	echo "/etc/makepkg.conf does not exist!"
-	exit 1
-fi
+. "$(dirname $0)/db-functions"
+
+source_makepkg
 
 packagename="$1"
 reponame="$2"
@@ -28,11 +24,10 @@ svnrepo="$reponame-$arch"
 [ "$UID" = "" ] && UID=$(uid)
 
 WORKDIR="/tmp/db-remove.$svnrepo.$UID"
-LOCKFILE="/tmp/.repolck.$arch.$reponame"
 
 cleanup() {
 	# unlock
-	rm -f "$LOCKFILE"
+	repo_unlock $reponame $arch
 	rm -rf "$WORKDIR"
 	[ "$1" ] && exit $1
 }
@@ -47,17 +42,11 @@ die() {
 	cleanup 1
 }
 
-# check for locks
-if [ -f "$LOCKFILE" ]; then
-	owner="$(/usr/bin/stat -c %U $LOCKFILE)"
-	echo "error: db generation is already in progress (started by $owner)"
-	exit 1
-fi
-
 trap ctrl_c 2
-trap cleanup 0
+trap cleanup 0 1
+
+repo_lock $reponame $arch
 
-/bin/touch "$LOCKFILE"
 /bin/mkdir -p "$WORKDIR"
 
 
-- 
cgit v1.2.3-2-g168b


From 42bbb3dd2ef276c5204651fafb152a888c449c15 Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaronmgriffin@gmail.com>
Date: Sat, 13 Sep 2008 20:30:27 -0500
Subject: Move temporary directories to /home/tmp

This is to allow moves to /home/ftp/ to remain on the same
filesystem, thus making the final moves atomic

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
---
 db-remove | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index f4d9419..fdc7c5d 100755
--- a/db-remove
+++ b/db-remove
@@ -23,7 +23,7 @@ svnrepo="$reponame-$arch"
 
 [ "$UID" = "" ] && UID=$(uid)
 
-WORKDIR="/tmp/db-remove.$svnrepo.$UID"
+WORKDIR="/home/tmp/db-remove.$svnrepo.$UID"
 
 cleanup() {
 	# unlock
-- 
cgit v1.2.3-2-g168b


From 23f48e65a5f4133be8a5d2883de6ffb2f4f04962 Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaronmgriffin@gmail.com>
Date: Tue, 21 Oct 2008 13:06:06 -0700
Subject: Add copy_helper function to ensure correct permissions

This will force all files copied back and forth to have
0664 permissions so that we can attempt to do away with
this permission adjusting cron job

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
---
 db-remove | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index fdc7c5d..bb91afd 100755
--- a/db-remove
+++ b/db-remove
@@ -68,7 +68,7 @@ cd "$WORKDIR"
 
 # copy the db file into our working area
 if [ -f "$ftppath/$reponame.db.tar.$DB_COMPRESSION" ]; then
-	cp "$ftppath/$reponame.db.tar.$DB_COMPRESSION" build/
+	copy_helper "$ftppath/$reponame.db.tar.$DB_COMPRESSION" build/
 else
 	echo "No database found at '$ftpdir', nothing more to do"
 	exit 0
@@ -78,7 +78,7 @@ echo "    Removing from $reponame DB file"
 cd build/
 /usr/bin/repo-remove "$reponame.db.tar.$DB_COMPRESSION" $packagename
 
-cp "$reponame.db.tar.$DB_COMPRESSION" "$ftppath/"
+copy_helper "$reponame.db.tar.$DB_COMPRESSION" "$ftppath/"
 
 echo "Package files will be cleaned up automatically"
 
-- 
cgit v1.2.3-2-g168b


From 2063416ef4a160f56bb47f203257fe7903ba77e2 Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaronmgriffin@gmail.com>
Date: Sun, 9 Nov 2008 00:27:43 -0600
Subject: Remove an erroneous '1' signal trap for cleanup() func

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
---
 db-remove | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index bb91afd..01f18d6 100755
--- a/db-remove
+++ b/db-remove
@@ -43,7 +43,7 @@ die() {
 }
 
 trap ctrl_c 2
-trap cleanup 0 1
+trap cleanup 0
 
 repo_lock $reponame $arch
 
-- 
cgit v1.2.3-2-g168b


From 35e5070403ddae96238bcce6356f4b9713c96675 Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaronmgriffin@gmail.com>
Date: Tue, 11 Nov 2008 22:09:24 -0800
Subject: Move as much as we can out to a config file

This should allow us to move FTP and SVN placement
around

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
---
 db-remove | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index 01f18d6..bdbd254 100755
--- a/db-remove
+++ b/db-remove
@@ -15,11 +15,8 @@ arch="$3"
 
 export CARCH="$arch"
 
-##### Arch specific stuff. TODO make this configurable #####
-ftppath="/home/ftp/$reponame/os/$arch/"
-svnpath="file:///home/svn-packages"
+ftppath="$FTP_BASE/$reponame/os/$arch/"
 svnrepo="$reponame-$arch"
-############################################################
 
 [ "$UID" = "" ] && UID=$(uid)
 
@@ -53,7 +50,7 @@ repo_lock $reponame $arch
 echo "==> Removing package '$packagename' from '$reponame'..." >&2
 
 cd "$WORKDIR"
-/usr/bin/svn checkout -N $svnpath checkout
+/usr/bin/svn checkout -N $SVN_PATH checkout
 cd checkout
 
 /usr/bin/svn up -q $packagename
-- 
cgit v1.2.3-2-g168b


From 1809269f1df368aab3f7f1bb615c2cdc52860a1f Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaronmgriffin@gmail.com>
Date: Thu, 20 Nov 2008 21:48:00 -0800
Subject: Move everything to /srv to support new server conf

Additionally, make TMPDIR configurable so we can move that

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
---
 db-remove | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index bdbd254..47268ed 100755
--- a/db-remove
+++ b/db-remove
@@ -20,7 +20,7 @@ svnrepo="$reponame-$arch"
 
 [ "$UID" = "" ] && UID=$(uid)
 
-WORKDIR="/home/tmp/db-remove.$svnrepo.$UID"
+WORKDIR="$TMPDIR/db-remove.$svnrepo.$UID"
 
 cleanup() {
 	# unlock
-- 
cgit v1.2.3-2-g168b


From 07ec0708d31794221bec7ee3e7f07755707fd36a Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaronmgriffin@gmail.com>
Date: Fri, 21 Nov 2008 01:05:09 -0500
Subject: Clear traps on cleanup

This prevents us from trying to remove the lockfile
twice, and calling cleanup multiple times

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
---
 db-remove | 1 +
 1 file changed, 1 insertion(+)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index 47268ed..2e0307d 100755
--- a/db-remove
+++ b/db-remove
@@ -23,6 +23,7 @@ svnrepo="$reponame-$arch"
 WORKDIR="$TMPDIR/db-remove.$svnrepo.$UID"
 
 cleanup() {
+    trap '' 0 2
 	# unlock
 	repo_unlock $reponame $arch
 	rm -rf "$WORKDIR"
-- 
cgit v1.2.3-2-g168b


From 5ed9e55f4d6a26452baaffadba407459ff96f295 Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaronmgriffin@gmail.com>
Date: Sat, 22 Nov 2008 17:48:58 -0600
Subject: Remove 'copy_helper' as chmodding is fail

The chmod doesn't work unless the user is the owner of the file
Resorting to umask changes here

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
---
 db-remove | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index 2e0307d..c5b6819 100755
--- a/db-remove
+++ b/db-remove
@@ -66,7 +66,7 @@ cd "$WORKDIR"
 
 # copy the db file into our working area
 if [ -f "$ftppath/$reponame.db.tar.$DB_COMPRESSION" ]; then
-	copy_helper "$ftppath/$reponame.db.tar.$DB_COMPRESSION" build/
+	/bin/cp "$ftppath/$reponame.db.tar.$DB_COMPRESSION" build/
 else
 	echo "No database found at '$ftpdir', nothing more to do"
 	exit 0
@@ -76,7 +76,7 @@ echo "    Removing from $reponame DB file"
 cd build/
 /usr/bin/repo-remove "$reponame.db.tar.$DB_COMPRESSION" $packagename
 
-copy_helper "$reponame.db.tar.$DB_COMPRESSION" "$ftppath/"
+/bin/cp "$reponame.db.tar.$DB_COMPRESSION" "$ftppath/"
 
 echo "Package files will be cleaned up automatically"
 
-- 
cgit v1.2.3-2-g168b


From 123e7560e49e04f9fdd552f9dc47bcedea2ea128 Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaronmgriffin@gmail.com>
Date: Fri, 12 Dec 2008 00:14:39 -0600
Subject: Quiet down repo-add just a bit

This assumes the -q flag patch is accepted for pacman 8)

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
---
 db-remove | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index c5b6819..acc849d 100755
--- a/db-remove
+++ b/db-remove
@@ -74,7 +74,7 @@ fi
 
 echo "    Removing from $reponame DB file"
 cd build/
-/usr/bin/repo-remove "$reponame.db.tar.$DB_COMPRESSION" $packagename
+/usr/bin/repo-remove -q "$reponame.db.tar.$DB_COMPRESSION" $packagename
 
 /bin/cp "$reponame.db.tar.$DB_COMPRESSION" "$ftppath/"
 
-- 
cgit v1.2.3-2-g168b


From 9b7b2a7e774f307b6b5ab398908e883364af7247 Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaronmgriffin@gmail.com>
Date: Fri, 20 Feb 2009 10:23:07 -0800
Subject: Add per-repo SVN configs

This could be useful if we move community to a separate
SVN repo

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
---
 db-remove | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index acc849d..501c70a 100755
--- a/db-remove
+++ b/db-remove
@@ -17,6 +17,7 @@ export CARCH="$arch"
 
 ftppath="$FTP_BASE/$reponame/os/$arch/"
 svnrepo="$reponame-$arch"
+svnpath="$(get_svnpath $reponame)"
 
 [ "$UID" = "" ] && UID=$(uid)
 
@@ -51,7 +52,7 @@ repo_lock $reponame $arch
 echo "==> Removing package '$packagename' from '$reponame'..." >&2
 
 cd "$WORKDIR"
-/usr/bin/svn checkout -N $SVN_PATH checkout
+/usr/bin/svn checkout -N $svnpath checkout
 cd checkout
 
 /usr/bin/svn up -q $packagename
-- 
cgit v1.2.3-2-g168b


From 67e112955482397bae1971fa60e1634a92ec361c Mon Sep 17 00:00:00 2001
From: Abhishek Dasgupta <abhidg@gmail.com>
Date: Fri, 20 Mar 2009 20:56:15 +0530
Subject: 'any' architecture support for db-move, db-remove Also: changed empty
 variable '$ftpdir' in db-remove       to '$ftppath/$architecture'

---
 db-remove | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index 501c70a..4763f3d 100755
--- a/db-remove
+++ b/db-remove
@@ -15,7 +15,7 @@ arch="$3"
 
 export CARCH="$arch"
 
-ftppath="$FTP_BASE/$reponame/os/$arch/"
+ftppath="$FTP_BASE/$reponame/os"
 svnrepo="$reponame-$arch"
 svnpath="$(get_svnpath $reponame)"
 
@@ -65,21 +65,29 @@ fi
 cd "$WORKDIR"
 [ -d build/ ] || mkdir build
 
-# copy the db file into our working area
-if [ -f "$ftppath/$reponame.db.tar.$DB_COMPRESSION" ]; then
-	/bin/cp "$ftppath/$reponame.db.tar.$DB_COMPRESSION" build/
+if [ "$arch" == "any" ]; then
+	arches="i686 x86_64"
 else
-	echo "No database found at '$ftpdir', nothing more to do"
-	exit 0
+	arches="$arch"
 fi
 
-echo "    Removing from $reponame DB file"
-cd build/
-/usr/bin/repo-remove -q "$reponame.db.tar.$DB_COMPRESSION" $packagename
-
-/bin/cp "$reponame.db.tar.$DB_COMPRESSION" "$ftppath/"
-
-echo "Package files will be cleaned up automatically"
-
+# copy the db file into our working area
+for architecture in $arches; do
+	if [ -f "$ftppath/$architecture/$reponame.db.tar.$DB_COMPRESSION" ]; then
+		/bin/cp "$ftppath/$architecture/$reponame.db.tar.$DB_COMPRESSION" build/
+	else
+		echo "No database found at '$ftppath/$architecture', nothing more to do"
+		exit 0
+	fi
+
+	echo "    Removing from $reponame DB file ($architecture)"
+	cd build/
+	/usr/bin/repo-remove -q "$reponame.db.tar.$DB_COMPRESSION" $packagename
+
+	/bin/mv "$reponame.db.tar.$DB_COMPRESSION" "$ftppath/$architecture"
+
+	echo "Package files will be cleaned up automatically"
+	cd ..
+done
 cleanup
 # vim: set ts=4 sw=4 noet ft=sh:
-- 
cgit v1.2.3-2-g168b


From 0691b6632e612818c52dbecfd2635fd954d42e23 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Tue, 21 Jul 2009 19:19:22 +0200
Subject: add support for split packages to db-remove

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
---
 db-remove | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index 4763f3d..621154d 100755
--- a/db-remove
+++ b/db-remove
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [ $# -ne 3 ]; then
-	echo "usage: $(basename $0) <pkgname> <reponame> <arch>"
+	echo "usage: $(basename $0) <pkgname|packagebase> <reponame> <arch>"
 	exit 1
 fi
 
@@ -9,7 +9,7 @@ fi
 
 source_makepkg
 
-packagename="$1"
+packagebase="$1"
 reponame="$2"
 arch="$3"
 
@@ -49,17 +49,23 @@ repo_lock $reponame $arch
 /bin/mkdir -p "$WORKDIR"
 
 
-echo "==> Removing package '$packagename' from '$reponame'..." >&2
+echo "==> Removing package '$packagebase' from '$reponame'..." >&2
 
 cd "$WORKDIR"
 /usr/bin/svn checkout -N $svnpath checkout
 cd checkout
 
-/usr/bin/svn up -q $packagename
-if [ -d "$packagename/repos/$svnrepo" ]; then
+/usr/bin/svn up -q $packagebase
+if [ -d "$packagebase/repos/$svnrepo" ]; then
 	echo "    Removing from subversion"
-	/usr/bin/svn rm --force -q "$packagename/repos/$svnrepo"
-	/usr/bin/svn commit -q -m "$(basename $0): $packagename removed by $(id -un)"
+	. "$packagebase/repos/$svnrepo/$BUILDSCRIPT"
+	/usr/bin/svn rm --force -q "$packagebase/repos/$svnrepo"
+	/usr/bin/svn commit -q -m "$(basename $0): $packagebase removed by $(id -un)"
+else
+	echo "    Warning: $packagebase not found in $svnrepo"
+	echo "             Removing split packages is not supported"
+	echo "             You need to specify each sub package instead"
+	pkgname=$packagebase
 fi
 
 cd "$WORKDIR"
@@ -82,7 +88,7 @@ for architecture in $arches; do
 
 	echo "    Removing from $reponame DB file ($architecture)"
 	cd build/
-	/usr/bin/repo-remove -q "$reponame.db.tar.$DB_COMPRESSION" $packagename
+	/usr/bin/repo-remove -q "$reponame.db.tar.$DB_COMPRESSION" ${pkgname[@]}
 
 	/bin/mv "$reponame.db.tar.$DB_COMPRESSION" "$ftppath/$architecture"
 
-- 
cgit v1.2.3-2-g168b


From 94c1ba6eed3fbdda8be0b7c67257d30dcabfd5c6 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Wed, 22 Jul 2009 20:02:37 +0200
Subject: remove support for different svn repos

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
---
 db-remove | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index 621154d..bbf8044 100755
--- a/db-remove
+++ b/db-remove
@@ -17,7 +17,6 @@ export CARCH="$arch"
 
 ftppath="$FTP_BASE/$reponame/os"
 svnrepo="$reponame-$arch"
-svnpath="$(get_svnpath $reponame)"
 
 [ "$UID" = "" ] && UID=$(uid)
 
@@ -52,7 +51,7 @@ repo_lock $reponame $arch
 echo "==> Removing package '$packagebase' from '$reponame'..." >&2
 
 cd "$WORKDIR"
-/usr/bin/svn checkout -N $svnpath checkout
+/usr/bin/svn checkout -N $SVNREPO checkout
 cd checkout
 
 /usr/bin/svn up -q $packagebase
-- 
cgit v1.2.3-2-g168b


From 1d94c827c8e9efe6e56bc15f993a1ce3764a675a Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sun, 16 Aug 2009 09:04:21 -0500
Subject: Add DB_COMPRESSION var to all scripts that need it

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 db-remove | 1 +
 1 file changed, 1 insertion(+)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index bbf8044..b246a8f 100755
--- a/db-remove
+++ b/db-remove
@@ -12,6 +12,7 @@ source_makepkg
 packagebase="$1"
 reponame="$2"
 arch="$3"
+DB_COMPRESSION='gz'
 
 export CARCH="$arch"
 
-- 
cgit v1.2.3-2-g168b


From b82a2ec63574c5fe0a0dd49b242d8c365155b828 Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaronmgriffin@gmail.com>
Date: Mon, 17 Aug 2009 15:12:33 -0700
Subject: Replace DB_COMPRESSION with DBEXT in the config

DBEXT contains the full extension for the db files (.db.tar.gz)
and is recorded in the config file

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
---
 db-remove | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index b246a8f..b4151c7 100755
--- a/db-remove
+++ b/db-remove
@@ -12,7 +12,6 @@ source_makepkg
 packagebase="$1"
 reponame="$2"
 arch="$3"
-DB_COMPRESSION='gz'
 
 export CARCH="$arch"
 
@@ -79,8 +78,8 @@ fi
 
 # copy the db file into our working area
 for architecture in $arches; do
-	if [ -f "$ftppath/$architecture/$reponame.db.tar.$DB_COMPRESSION" ]; then
-		/bin/cp "$ftppath/$architecture/$reponame.db.tar.$DB_COMPRESSION" build/
+	if [ -f "$ftppath/$architecture/$reponame$DBEXT" ]; then
+		/bin/cp "$ftppath/$architecture/$reponame$DBEXT" build/
 	else
 		echo "No database found at '$ftppath/$architecture', nothing more to do"
 		exit 0
@@ -88,9 +87,9 @@ for architecture in $arches; do
 
 	echo "    Removing from $reponame DB file ($architecture)"
 	cd build/
-	/usr/bin/repo-remove -q "$reponame.db.tar.$DB_COMPRESSION" ${pkgname[@]}
+	/usr/bin/repo-remove -q "$reponame$DBEXT" ${pkgname[@]}
 
-	/bin/mv "$reponame.db.tar.$DB_COMPRESSION" "$ftppath/$architecture"
+	/bin/mv "$reponame$DBEXT" "$ftppath/$architecture"
 
 	echo "Package files will be cleaned up automatically"
 	cd ..
-- 
cgit v1.2.3-2-g168b


From 15de56aa8bb8104a01a983393f8a398348714a3a Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaronmgriffin@gmail.com>
Date: Mon, 17 Aug 2009 15:20:27 -0700
Subject: Remove dependence on makepkg.conf

Removed the need for makepkg.conf
* Killed off CARCH
* Added PKGEXT to the config file
* Remove source_makepkg function
* Source config file where makepkg.conf was needed

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
---
 db-remove | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index b4151c7..eae204e 100755
--- a/db-remove
+++ b/db-remove
@@ -7,14 +7,10 @@ fi
 
 . "$(dirname $0)/db-functions"
 
-source_makepkg
-
 packagebase="$1"
 reponame="$2"
 arch="$3"
 
-export CARCH="$arch"
-
 ftppath="$FTP_BASE/$reponame/os"
 svnrepo="$reponame-$arch"
 
-- 
cgit v1.2.3-2-g168b


From a4d0a6cba591e0866c249a0c2014297bdbbfb779 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20B=C3=A9langer?= <snowmaniscool@gmail.com>
Date: Tue, 18 Aug 2009 16:37:09 -0700
Subject: Fix arch parameter handling in db-remove

db-remove use the arch variable to handle the arch parameter passed to the
script. As the arch variable is already used in PKGBUILD, this variable
conflict cause unwanted behaviour.

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
---
 db-remove | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index eae204e..3ba7dd7 100755
--- a/db-remove
+++ b/db-remove
@@ -9,10 +9,10 @@ fi
 
 packagebase="$1"
 reponame="$2"
-arch="$3"
+_arch="$3"
 
 ftppath="$FTP_BASE/$reponame/os"
-svnrepo="$reponame-$arch"
+svnrepo="$reponame-$_arch"
 
 [ "$UID" = "" ] && UID=$(uid)
 
@@ -21,7 +21,7 @@ WORKDIR="$TMPDIR/db-remove.$svnrepo.$UID"
 cleanup() {
     trap '' 0 2
 	# unlock
-	repo_unlock $reponame $arch
+	repo_unlock $reponame $_arch
 	rm -rf "$WORKDIR"
 	[ "$1" ] && exit $1
 }
@@ -39,7 +39,7 @@ die() {
 trap ctrl_c 2
 trap cleanup 0
 
-repo_lock $reponame $arch
+repo_lock $reponame $_arch
 
 /bin/mkdir -p "$WORKDIR"
 
@@ -66,10 +66,10 @@ fi
 cd "$WORKDIR"
 [ -d build/ ] || mkdir build
 
-if [ "$arch" == "any" ]; then
+if [ "$_arch" == "any" ]; then
 	arches="i686 x86_64"
 else
-	arches="$arch"
+	arches="$_arch"
 fi
 
 # copy the db file into our working area
-- 
cgit v1.2.3-2-g168b


From 2afa1063284a25ae2691b2727c45238d15025a9a Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sun, 13 Sep 2009 18:16:55 -0500
Subject: Be more careful with config file inclusion

We can't really do the basedir magic from db-functions as it is just being
sourced and is not the currently executing script. Although a bit
repetitive, it is a lot safer to just include the config file everywhere.

Noticed this when trying to run the latest available scripts on sigurd.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 db-remove | 1 +
 1 file changed, 1 insertion(+)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index 3ba7dd7..3190231 100755
--- a/db-remove
+++ b/db-remove
@@ -6,6 +6,7 @@ if [ $# -ne 3 ]; then
 fi
 
 . "$(dirname $0)/db-functions"
+. "$(dirname $0)/config"
 
 packagebase="$1"
 reponame="$2"
-- 
cgit v1.2.3-2-g168b


From ad520b527f3c5d2471e4b471eca5439643a01939 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 11 Apr 2010 13:52:32 +0200
Subject: Fail if lock couldn't be obtained; Unlock the repos if ftpdir-cleanup
 fails

---
 db-remove | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index 3190231..0b77fc1 100755
--- a/db-remove
+++ b/db-remove
@@ -40,7 +40,7 @@ die() {
 trap ctrl_c 2
 trap cleanup 0
 
-repo_lock $reponame $_arch
+repo_lock $reponame $_arch || exit 1
 
 /bin/mkdir -p "$WORKDIR"
 
-- 
cgit v1.2.3-2-g168b


From c117d9048ae591401a79037222da7bf7bda85705 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 8 Aug 2010 03:44:17 +0200
Subject: Reduce verbosity

Only inform of errors and processes that might take longer.
---
 db-remove | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index 0b77fc1..357e6c4 100755
--- a/db-remove
+++ b/db-remove
@@ -42,26 +42,21 @@ trap cleanup 0
 
 repo_lock $reponame $_arch || exit 1
 
+echo -n "Removing $packagebase from $reponame..."
 /bin/mkdir -p "$WORKDIR"
-
-
-echo "==> Removing package '$packagebase' from '$reponame'..." >&2
-
 cd "$WORKDIR"
-/usr/bin/svn checkout -N $SVNREPO checkout
+/usr/bin/svn checkout -q -N $SVNREPO checkout >/dev/null
 cd checkout
 
 /usr/bin/svn up -q $packagebase
 if [ -d "$packagebase/repos/$svnrepo" ]; then
-	echo "    Removing from subversion"
 	. "$packagebase/repos/$svnrepo/$BUILDSCRIPT"
 	/usr/bin/svn rm --force -q "$packagebase/repos/$svnrepo"
 	/usr/bin/svn commit -q -m "$(basename $0): $packagebase removed by $(id -un)"
 else
 	echo "    Warning: $packagebase not found in $svnrepo"
-	echo "             Removing split packages is not supported"
-	echo "             You need to specify each sub package instead"
-	pkgname=$packagebase
+	echo "             Removing split packages is not yet supported"
+	exit 1
 fi
 
 cd "$WORKDIR"
@@ -82,14 +77,16 @@ for architecture in $arches; do
 		exit 0
 	fi
 
-	echo "    Removing from $reponame DB file ($architecture)"
 	cd build/
-	/usr/bin/repo-remove -q "$reponame$DBEXT" ${pkgname[@]}
+	/usr/bin/repo-remove -q "$reponame$DBEXT" ${pkgname[@]} >/dev/null
 
 	/bin/mv "$reponame$DBEXT" "$ftppath/$architecture"
 
-	echo "Package files will be cleaned up automatically"
 	cd ..
 done
+
+echo 'done'
+
 cleanup
+
 # vim: set ts=4 sw=4 noet ft=sh:
-- 
cgit v1.2.3-2-g168b


From 20f1c1c27a1691cf92ad11ebc81dfaa175ace305 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 8 Aug 2010 11:39:42 +0200
Subject: Cleanup db-remove

* There is no need to copy the db into a working dir
* cleanup is automatically called on exit
---
 db-remove | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index 357e6c4..bf325c4 100755
--- a/db-remove
+++ b/db-remove
@@ -54,13 +54,10 @@ if [ -d "$packagebase/repos/$svnrepo" ]; then
 	/usr/bin/svn rm --force -q "$packagebase/repos/$svnrepo"
 	/usr/bin/svn commit -q -m "$(basename $0): $packagebase removed by $(id -un)"
 else
-	echo "    Warning: $packagebase not found in $svnrepo"
-	echo "             Removing split packages is not yet supported"
-	exit 1
+	die "Error: $packagebase not found in $svnrepo"
 fi
 
 cd "$WORKDIR"
-[ -d build/ ] || mkdir build
 
 if [ "$_arch" == "any" ]; then
 	arches="i686 x86_64"
@@ -69,24 +66,14 @@ else
 fi
 
 # copy the db file into our working area
-for architecture in $arches; do
-	if [ -f "$ftppath/$architecture/$reponame$DBEXT" ]; then
-		/bin/cp "$ftppath/$architecture/$reponame$DBEXT" build/
-	else
-		echo "No database found at '$ftppath/$architecture', nothing more to do"
-		exit 0
+for arch in $arches; do
+	if [ ! -f "$ftppath/$arch/$reponame$DBEXT" ]; then
+		die "No database found at '$ftppath/$arch', nothing more to do"
 	fi
 
-	cd build/
-	/usr/bin/repo-remove -q "$reponame$DBEXT" ${pkgname[@]} >/dev/null
-
-	/bin/mv "$reponame$DBEXT" "$ftppath/$architecture"
-
-	cd ..
+	/usr/bin/repo-remove -q "$ftppath/$arch/$reponame$DBEXT" ${pkgname[@]} >/dev/null
 done
 
 echo 'done'
 
-cleanup
-
 # vim: set ts=4 sw=4 noet ft=sh:
-- 
cgit v1.2.3-2-g168b


From d0b5dcb3ce6a1ec5222fc7a0420b3e1dc4c3a27e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 8 Aug 2010 11:53:07 +0200
Subject: Remove BUILDSCRIPT variable

There is no need to have a variable for things like PKGBUILD
that are very unlikely to ever change.
---
 db-remove | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index bf325c4..1314bb7 100755
--- a/db-remove
+++ b/db-remove
@@ -50,7 +50,7 @@ cd checkout
 
 /usr/bin/svn up -q $packagebase
 if [ -d "$packagebase/repos/$svnrepo" ]; then
-	. "$packagebase/repos/$svnrepo/$BUILDSCRIPT"
+	. "$packagebase/repos/$svnrepo/PKGBUILD"
 	/usr/bin/svn rm --force -q "$packagebase/repos/$svnrepo"
 	/usr/bin/svn commit -q -m "$(basename $0): $packagebase removed by $(id -un)"
 else
-- 
cgit v1.2.3-2-g168b


From 388d629327d97e8d15a7a67cc87ae36edfe2f385 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 8 Aug 2010 13:08:47 +0200
Subject: use common workdir

---
 db-remove | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index 1314bb7..0da9e75 100755
--- a/db-remove
+++ b/db-remove
@@ -15,10 +15,6 @@ _arch="$3"
 ftppath="$FTP_BASE/$reponame/os"
 svnrepo="$reponame-$_arch"
 
-[ "$UID" = "" ] && UID=$(uid)
-
-WORKDIR="$TMPDIR/db-remove.$svnrepo.$UID"
-
 cleanup() {
     trap '' 0 2
 	# unlock
@@ -43,7 +39,6 @@ trap cleanup 0
 repo_lock $reponame $_arch || exit 1
 
 echo -n "Removing $packagebase from $reponame..."
-/bin/mkdir -p "$WORKDIR"
 cd "$WORKDIR"
 /usr/bin/svn checkout -q -N $SVNREPO checkout >/dev/null
 cd checkout
-- 
cgit v1.2.3-2-g168b


From 9eb1cd7b9403533c4b60ecfbbbf00a08c211059a Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 8 Aug 2010 15:03:27 +0200
Subject: Move common function to db-functions

db-functions now sets an individual $WORKDIR and implements trap functinos that
remove locks on exit or error. There are new functions to lock and unlock the running script.

misc-scripts/ftpdir-cleanup was renamed to ftpdir-cleanup-repo as the cron-job had the same name.
Script names have to be unique when using db-functions.
---
 db-remove | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index 0da9e75..5d61c97 100755
--- a/db-remove
+++ b/db-remove
@@ -15,27 +15,6 @@ _arch="$3"
 ftppath="$FTP_BASE/$reponame/os"
 svnrepo="$reponame-$_arch"
 
-cleanup() {
-    trap '' 0 2
-	# unlock
-	repo_unlock $reponame $_arch
-	rm -rf "$WORKDIR"
-	[ "$1" ] && exit $1
-}
-
-ctrl_c() {
-	echo "Interrupted" >&2
-	cleanup 0
-}
-
-die() {
-	echo "$*" >&2
-	cleanup 1
-}
-
-trap ctrl_c 2
-trap cleanup 0
-
 repo_lock $reponame $_arch || exit 1
 
 echo -n "Removing $packagebase from $reponame..."
@@ -71,4 +50,6 @@ done
 
 echo 'done'
 
+repo_unlock $reponame $_arch || exit 1
+
 # vim: set ts=4 sw=4 noet ft=sh:
-- 
cgit v1.2.3-2-g168b


From 830c4d84d13712974ffd392cdcc58b038c0dcfd9 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 8 Aug 2010 16:03:11 +0200
Subject: Source PKGBUILD in subshells

This patch sources a PKGBUILD in a subshells instead of directly.
This way we don't polute our scope or overwrite our vars which might lead to unexpected behavior.
---
 db-remove | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index 5d61c97..5a55849 100755
--- a/db-remove
+++ b/db-remove
@@ -10,12 +10,12 @@ fi
 
 packagebase="$1"
 reponame="$2"
-_arch="$3"
+arch="$3"
 
 ftppath="$FTP_BASE/$reponame/os"
-svnrepo="$reponame-$_arch"
+svnrepo="$reponame-$arch"
 
-repo_lock $reponame $_arch || exit 1
+repo_lock $reponame $arch || exit 1
 
 echo -n "Removing $packagebase from $reponame..."
 cd "$WORKDIR"
@@ -24,7 +24,7 @@ cd checkout
 
 /usr/bin/svn up -q $packagebase
 if [ -d "$packagebase/repos/$svnrepo" ]; then
-	. "$packagebase/repos/$svnrepo/PKGBUILD"
+	pkgname=($(. "$packagebase/repos/$svnrepo/PKGBUILD"; echo ${pkgname[@]}))
 	/usr/bin/svn rm --force -q "$packagebase/repos/$svnrepo"
 	/usr/bin/svn commit -q -m "$(basename $0): $packagebase removed by $(id -un)"
 else
@@ -33,23 +33,23 @@ fi
 
 cd "$WORKDIR"
 
-if [ "$_arch" == "any" ]; then
+if [ "$arch" == "any" ]; then
 	arches="i686 x86_64"
 else
-	arches="$_arch"
+	arches="$arch"
 fi
 
 # copy the db file into our working area
-for arch in $arches; do
-	if [ ! -f "$ftppath/$arch/$reponame$DBEXT" ]; then
-		die "No database found at '$ftppath/$arch', nothing more to do"
+for tarch in $arches; do
+	if [ ! -f "$ftppath/$tarch/$reponame$DBEXT" ]; then
+		die "No database found at '$ftppath/$tarch', nothing more to do"
 	fi
 
-	/usr/bin/repo-remove -q "$ftppath/$arch/$reponame$DBEXT" ${pkgname[@]} >/dev/null
+	/usr/bin/repo-remove -q "$ftppath/$tarch/$reponame$DBEXT" ${pkgname[@]} >/dev/null
 done
 
 echo 'done'
 
-repo_unlock $reponame $_arch || exit 1
+repo_unlock $reponame $arch || exit 1
 
 # vim: set ts=4 sw=4 noet ft=sh:
-- 
cgit v1.2.3-2-g168b


From e2c005b490df6762e23da3223944151c17d1de80 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Fri, 13 Aug 2010 08:20:27 +0200
Subject: Check permission before any action

Added a function to check if user has permission to alter the repos
and db files.
---
 db-remove | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index 5a55849..1492d18 100755
--- a/db-remove
+++ b/db-remove
@@ -15,6 +15,11 @@ arch="$3"
 ftppath="$FTP_BASE/$reponame/os"
 svnrepo="$reponame-$arch"
 
+if ! check_repo_permission $reponame; then
+	echo "Error: You don't have permission to remove packages from ${reponam}"
+	exit 1
+fi
+
 repo_lock $reponame $arch || exit 1
 
 echo -n "Removing $packagebase from $reponame..."
-- 
cgit v1.2.3-2-g168b


From a422060414670bb49d2422a38467b73ae01e7ecb Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Fri, 13 Aug 2010 09:47:31 +0200
Subject: Use common functions to print messages, warnings and errors

These functions are copied from makepkg
---
 db-remove | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index 1492d18..2f05c16 100755
--- a/db-remove
+++ b/db-remove
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [ $# -ne 3 ]; then
-	echo "usage: $(basename $0) <pkgname|packagebase> <reponame> <arch>"
+	msg "usage: $(basename $0) <pkgname|packagebase> <reponame> <arch>"
 	exit 1
 fi
 
@@ -16,13 +16,13 @@ ftppath="$FTP_BASE/$reponame/os"
 svnrepo="$reponame-$arch"
 
 if ! check_repo_permission $reponame; then
-	echo "Error: You don't have permission to remove packages from ${reponam}"
+	error "You don't have permission to remove packages from ${reponam}"
 	exit 1
 fi
 
 repo_lock $reponame $arch || exit 1
 
-echo -n "Removing $packagebase from $reponame..."
+msg "Removing $packagebase from $reponame..."
 cd "$WORKDIR"
 /usr/bin/svn checkout -q -N $SVNREPO checkout >/dev/null
 cd checkout
@@ -33,7 +33,7 @@ if [ -d "$packagebase/repos/$svnrepo" ]; then
 	/usr/bin/svn rm --force -q "$packagebase/repos/$svnrepo"
 	/usr/bin/svn commit -q -m "$(basename $0): $packagebase removed by $(id -un)"
 else
-	die "Error: $packagebase not found in $svnrepo"
+	die "$packagebase not found in $svnrepo"
 fi
 
 cd "$WORKDIR"
@@ -53,8 +53,6 @@ for tarch in $arches; do
 	/usr/bin/repo-remove -q "$ftppath/$tarch/$reponame$DBEXT" ${pkgname[@]} >/dev/null
 done
 
-echo 'done'
-
 repo_unlock $reponame $arch || exit 1
 
 # vim: set ts=4 sw=4 noet ft=sh:
-- 
cgit v1.2.3-2-g168b


From 1aec9771b5c2b29ef2427e3aaabd7ef5f58195c5 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 14 Aug 2010 22:40:14 +0200
Subject: Don't use hard coded architectures in db-remove

---
 db-remove | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index 2f05c16..3a4a38e 100755
--- a/db-remove
+++ b/db-remove
@@ -39,13 +39,13 @@ fi
 cd "$WORKDIR"
 
 if [ "$arch" == "any" ]; then
-	arches="i686 x86_64"
+	tarches=(${ARCHES[@]})
 else
-	arches="$arch"
+	tarches=("$arch")
 fi
 
 # copy the db file into our working area
-for tarch in $arches; do
+for tarch in ${tarches[@]}; do
 	if [ ! -f "$ftppath/$tarch/$reponame$DBEXT" ]; then
 		die "No database found at '$ftppath/$tarch', nothing more to do"
 	fi
-- 
cgit v1.2.3-2-g168b


From e81b73f7cd4d0fc5944c26ccd1ff22e0883c295e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 15 Aug 2010 18:17:10 +0200
Subject: Use common names for repos

---
 db-remove | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index 3a4a38e..5afd858 100755
--- a/db-remove
+++ b/db-remove
@@ -22,7 +22,7 @@ fi
 
 repo_lock $reponame $arch || exit 1
 
-msg "Removing $packagebase from $reponame..."
+msg "Removing $packagebase from [$reponame]..."
 cd "$WORKDIR"
 /usr/bin/svn checkout -q -N $SVNREPO checkout >/dev/null
 cd checkout
-- 
cgit v1.2.3-2-g168b


From 6f6ed4dc9f1bbce3638824def5d07b78aff44cde Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 15 Aug 2010 20:56:12 +0200
Subject: Fix locking in db-remove

---
 db-remove | 56 +++++++++++++++++++++++++-------------------------------
 1 file changed, 25 insertions(+), 31 deletions(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index 5afd858..188cc60 100755
--- a/db-remove
+++ b/db-remove
@@ -1,58 +1,52 @@
 #!/bin/bash
 
 if [ $# -ne 3 ]; then
-	msg "usage: $(basename $0) <pkgname|packagebase> <reponame> <arch>"
+	msg "usage: $(basename $0) <pkgname|pkgbase> <repo> <arch>"
 	exit 1
 fi
 
 . "$(dirname $0)/db-functions"
 . "$(dirname $0)/config"
 
-packagebase="$1"
-reponame="$2"
+pkgbase="$1"
+repo="$2"
 arch="$3"
 
-ftppath="$FTP_BASE/$reponame/os"
-svnrepo="$reponame-$arch"
+ftppath="$FTP_BASE/$repo/os"
+svnrepo="$repo-$arch"
 
-if ! check_repo_permission $reponame; then
-	error "You don't have permission to remove packages from ${reponam}"
-	exit 1
+if ! check_repo_permission $repo; then
+	die "You don't have permission to remove packages from ${reponam}"
 fi
 
-repo_lock $reponame $arch || exit 1
-
-msg "Removing $packagebase from [$reponame]..."
-cd "$WORKDIR"
-/usr/bin/svn checkout -q -N $SVNREPO checkout >/dev/null
-cd checkout
-
-/usr/bin/svn up -q $packagebase
-if [ -d "$packagebase/repos/$svnrepo" ]; then
-	pkgname=($(. "$packagebase/repos/$svnrepo/PKGBUILD"; echo ${pkgname[@]}))
-	/usr/bin/svn rm --force -q "$packagebase/repos/$svnrepo"
-	/usr/bin/svn commit -q -m "$(basename $0): $packagebase removed by $(id -un)"
+if [ "$arch" == "any" ]; then
+	tarches=(${ARCHES[@]})
 else
-	die "$packagebase not found in $svnrepo"
+	tarches=("$arch")
 fi
 
-cd "$WORKDIR"
+for tarch in ${tarches[@]}; do
+	repo_lock $repo $tarch || exit 1
+done
 
-if [ "$arch" == "any" ]; then
-	tarches=(${ARCHES[@]})
+msg "Removing $pkgbase from [$repo]..."
+/usr/bin/svn checkout -q "${SVNREPO}/${pkgbase}" "${WORKDIR}/svn/${pkgbase}" >/dev/null
+
+if [ -d "${WORKDIR}/svn/$pkgbase/repos/$svnrepo" ]; then
+	pkgnames=($(. "${WORKDIR}/svn/$pkgbase/repos/$svnrepo/PKGBUILD"; echo ${pkgname[@]}))
+	/usr/bin/svn rm --force -q "${WORKDIR}/svn/$pkgbase/repos/$svnrepo"
+	/usr/bin/svn commit -q "${WORKDIR}/svn/$pkgbase" -m "$(basename $0): $pkgbase removed by $(id -un)"
 else
-	tarches=("$arch")
+	die "$pkgbase not found in $svnrepo"
 fi
 
+
 # copy the db file into our working area
 for tarch in ${tarches[@]}; do
-	if [ ! -f "$ftppath/$tarch/$reponame$DBEXT" ]; then
+	if [ ! -f "$ftppath/$tarch/$repo$DBEXT" ]; then
 		die "No database found at '$ftppath/$tarch', nothing more to do"
 	fi
 
-	/usr/bin/repo-remove -q "$ftppath/$tarch/$reponame$DBEXT" ${pkgname[@]} >/dev/null
+	/usr/bin/repo-remove -q "$ftppath/$tarch/$repo$DBEXT" ${pkgnames[@]} >/dev/null
+	repo_unlock $repo $tarch
 done
-
-repo_unlock $reponame $arch || exit 1
-
-# vim: set ts=4 sw=4 noet ft=sh:
-- 
cgit v1.2.3-2-g168b


From e9948d8392d5ab986541c0d7120f1e5c510261ad Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Tue, 24 Aug 2010 12:27:52 +0200
Subject: db-remove: source functions before using them

---
 db-remove | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index 188cc60..8dabb18 100755
--- a/db-remove
+++ b/db-remove
@@ -1,13 +1,13 @@
 #!/bin/bash
 
+. "$(dirname $0)/db-functions"
+. "$(dirname $0)/config"
+
 if [ $# -ne 3 ]; then
 	msg "usage: $(basename $0) <pkgname|pkgbase> <repo> <arch>"
 	exit 1
 fi
 
-. "$(dirname $0)/db-functions"
-. "$(dirname $0)/config"
-
 pkgbase="$1"
 repo="$2"
 arch="$3"
-- 
cgit v1.2.3-2-g168b


From 3b903c5c46287cc6f453b3138842715a467c57fb Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 2 Sep 2010 14:50:04 +0200
Subject: Set correct group after touching the db file

* When writing the db file ensure that it has write permission of the group which owns the parent directory.
* This should make the adjust-permissions cron job obsolete.
---
 db-remove | 1 +
 1 file changed, 1 insertion(+)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index 8dabb18..6743eea 100755
--- a/db-remove
+++ b/db-remove
@@ -48,5 +48,6 @@ for tarch in ${tarches[@]}; do
 	fi
 
 	/usr/bin/repo-remove -q "$ftppath/$tarch/$repo$DBEXT" ${pkgnames[@]} >/dev/null
+	set_repo_permission "${repo}" "${tarch}"
 	repo_unlock $repo $tarch
 done
-- 
cgit v1.2.3-2-g168b


From 53ecffc2f30b2678709105892b60073f7c9c0847 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Mon, 22 Nov 2010 14:36:09 +0100
Subject: Add wrappers for repo-add and repo-remove

---
 db-remove | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index 6743eea..b246ce3 100755
--- a/db-remove
+++ b/db-remove
@@ -16,7 +16,7 @@ ftppath="$FTP_BASE/$repo/os"
 svnrepo="$repo-$arch"
 
 if ! check_repo_permission $repo; then
-	die "You don't have permission to remove packages from ${reponam}"
+	die "You don't have permission to remove packages from ${repo}"
 fi
 
 if [ "$arch" == "any" ]; then
@@ -40,8 +40,6 @@ else
 	die "$pkgbase not found in $svnrepo"
 fi
 
-
-# copy the db file into our working area
 for tarch in ${tarches[@]}; do
 	if [ ! -f "$ftppath/$tarch/$repo$DBEXT" ]; then
 		die "No database found at '$ftppath/$tarch', nothing more to do"
-- 
cgit v1.2.3-2-g168b


From 4da9bf112b07c94a7fd65a729ce62610ade8e5aa Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 15 Jan 2011 01:12:09 +0100
Subject: Move repo manipulation code into common functions

repo-add and repo-remove is now indirectly called by arch_repo_add/remove.
This simplifies future extensions like incremental file list creations. See FS#11302
---
 db-remove | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index b246ce3..cc65eb9 100755
--- a/db-remove
+++ b/db-remove
@@ -41,11 +41,6 @@ else
 fi
 
 for tarch in ${tarches[@]}; do
-	if [ ! -f "$ftppath/$tarch/$repo$DBEXT" ]; then
-		die "No database found at '$ftppath/$tarch', nothing more to do"
-	fi
-
-	/usr/bin/repo-remove -q "$ftppath/$tarch/$repo$DBEXT" ${pkgnames[@]} >/dev/null
-	set_repo_permission "${repo}" "${tarch}"
+	arch_repo_remove "${repo}" "${tarch}" ${pkgnames[@]}
 	repo_unlock $repo $tarch
 done
-- 
cgit v1.2.3-2-g168b


From af06266bf8d7eb0377dd6dcfad7bf1b9c1f79825 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 30 Jan 2011 12:17:42 +0100
Subject: Try to remove a package even if it is no longer in svn

---
 db-remove | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index cc65eb9..292af5d 100755
--- a/db-remove
+++ b/db-remove
@@ -37,7 +37,7 @@ if [ -d "${WORKDIR}/svn/$pkgbase/repos/$svnrepo" ]; then
 	/usr/bin/svn rm --force -q "${WORKDIR}/svn/$pkgbase/repos/$svnrepo"
 	/usr/bin/svn commit -q "${WORKDIR}/svn/$pkgbase" -m "$(basename $0): $pkgbase removed by $(id -un)"
 else
-	die "$pkgbase not found in $svnrepo"
+	warning "$pkgbase not found in $svnrepo"
 fi
 
 for tarch in ${tarches[@]}; do
-- 
cgit v1.2.3-2-g168b