From 22dd30328ec4229321f1f96026704ff3cf1cc621 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Tue, 1 Nov 2011 09:55:25 -0500
Subject: db-*: always handle pkgname/pkgbase/pkgfile argument last

This matches what we do in db-update, and makes the most sense if we
want to expand these commands to take multiple arguments at the same
time. Especially in the case of db-repo-add and db-repo-remove, these
wrapper commands should be no more limiting than repo-add and
repo-remove which always allow multiple arguments and are more efficient
that way.

This patch simply reorders the arguments; a later patch will support
multiple pkgname/pkgbase/pkgfile arguments on the command line.

Although this does break backwards compatibility and requires some
changing of muscle memory, I think it is a worthwhile change to make as
the functionality of these commands becomes more powerful and the order
of arguments becomes the same in all of them.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 db-repo-add | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'db-repo-add')

diff --git a/db-repo-add b/db-repo-add
index 53cfc84..8d4a56d 100755
--- a/db-repo-add
+++ b/db-repo-add
@@ -4,13 +4,13 @@
 . "$(dirname $0)/config"
 
 if [ $# -ne 3 ]; then
-	msg "usage: $(basename $0) <pkgfile> <repo> <arch>"
+	msg "usage: $(basename $0) <repo> <arch> <pkgfile>"
 	exit 1
 fi
 
-pkgfile="$1"
-repo="$2"
-arch="$3"
+repo="$1"
+arch="$2"
+pkgfile="$3"
 
 ftppath="$FTP_BASE/$repo/os"
 
-- 
cgit v1.2.3-2-g168b


From bbf00cc90ed8d1bf3bbed1f78acca71b2d624ee2 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Tue, 1 Nov 2011 09:55:26 -0500
Subject: db-repo-{add, remove}: allow specifying multiple packages

This allows invoking these commands for more than one package at a time
which is incredibly more efficient as the database doesn't need to be
locked, unpacked, modified, changed, and unlocked for every single
passed package name or file if you have more than one.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 db-repo-add | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'db-repo-add')

diff --git a/db-repo-add b/db-repo-add
index 8d4a56d..9661b91 100755
--- a/db-repo-add
+++ b/db-repo-add
@@ -3,14 +3,14 @@
 . "$(dirname $0)/db-functions"
 . "$(dirname $0)/config"
 
-if [ $# -ne 3 ]; then
-	msg "usage: $(basename $0) <repo> <arch> <pkgfile>"
+if [ $# -lt 3 ]; then
+	msg "usage: $(basename $0) <repo> <arch> <pkgfile> ..."
 	exit 1
 fi
 
 repo="$1"
 arch="$2"
-pkgfile="$3"
+pkgfiles=(${@:3})
 
 ftppath="$FTP_BASE/$repo/os"
 
@@ -28,12 +28,14 @@ for tarch in ${tarches[@]}; do
 	repo_lock $repo $tarch || exit 1
 done
 
-msg "Adding $pkgfile to [$repo]..."
-
 for tarch in ${tarches[@]}; do
-	if [ ! -f "${pkgfile}" ]; then
-		die "Package file ${pkgfile} not found"
-	fi
-	arch_repo_add "${repo}" "${tarch}" ${pkgfile}
+	for pkgfile in ${pkgfiles[@]}; do
+		if [[ ! -f $pkgfile ]]; then
+			die "Package file $pkgfile not found"
+		else
+			msg "Adding $pkgfile to [$repo]..."
+		fi
+	done
+	arch_repo_add "${repo}" "${tarch}" ${pkgfiles[@]}
 	repo_unlock $repo $tarch
 done
-- 
cgit v1.2.3-2-g168b


From 23a508412936b1408e9ce9399e675fc1397c28eb Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 5 Nov 2011 18:10:08 +0100
Subject: db-repo-add: At least check if the package to be added is available
 in the correct directory

---
 db-repo-add | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'db-repo-add')

diff --git a/db-repo-add b/db-repo-add
index 9661b91..b83fb77 100755
--- a/db-repo-add
+++ b/db-repo-add
@@ -30,8 +30,8 @@ done
 
 for tarch in ${tarches[@]}; do
 	for pkgfile in ${pkgfiles[@]}; do
-		if [[ ! -f $pkgfile ]]; then
-			die "Package file $pkgfile not found"
+		if [[ ! -f "${FTP_BASE}/${repo}/os/${arch}/${pkgfile##*/}" ]]; then
+			die "Package file ${pkgfile##*/} not found in ${FTP_BASE}/${repo}/os/${arch}/"
 		else
 			msg "Adding $pkgfile to [$repo]..."
 		fi
-- 
cgit v1.2.3-2-g168b