From 8e2d2c6df75a992cf65ab24e7f97de9a9f04174c Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaronmgriffin@gmail.com>
Date: Wed, 21 May 2008 00:33:12 -0400
Subject: Add db-move related scripts

Used to easilly move a package from one repo to another

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

(limited to 'db-move')

diff --git a/db-move b/db-move
new file mode 100755
index 0000000..cb559d2
--- /dev/null
+++ b/db-move
@@ -0,0 +1,120 @@
+#!/bin/bash
+# Originally from Pierre's testing2extra script
+
+if [ $# -ne 4 ]; then
+	echo "usage: $(basename $0) <pkgname> <repo-from> <repo-to> <arch>"
+	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"
+repofrom="$2"
+repoto="$3"
+arch="$4"
+
+export CARCH="$arch"
+
+##### Arch specific stuff. TODO make this configurable #####
+ftppath_from="/home/ftp/$repofrom/os/$arch/"
+ftppath_to="/home/ftp/$repoto/os/$arch/"
+svnpath="file:///home/svn-packages"
+svnrepo_from="$repofrom-$arch"
+svnrepo_to="$repoto-$arch"
+############################################################
+
+[ "$UID" = "" ] && UID=$(uid)
+
+WORKDIR="/tmp/db-move.$svnrepo_from.$svnrepo_to.$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)"
+	die "error: db generation is already in progress (started by $owner)"
+fi
+
+trap ctrl_c 2
+trap cleanup 0
+
+/bin/touch "$LOCKFILE"
+/bin/mkdir -p "$WORKDIR"
+
+cd "$WORKDIR"
+/usr/bin/svn checkout -N $svnpath checkout
+cd checkout
+
+/usr/bin/svn up -q $packagename
+if [ -d "$packagename/repos/$svnrepo_from" ]; then
+    . "$packagename/repos/$svnrepo_from/$BUILDSCRIPT"
+    _pkgfile="$pkgname-$pkgver-$pkgrel-$CARCH$PKGEXT"
+
+    if [ ! -f "$ftppath_from/$_pkgfile" ]; then
+        die "error: package file '$_pkgfile' not found in repo '$repofrom'"
+    fi
+
+    if [ -d "$packagename/repos/$svnrepo_to" ]; then
+        echo "    Removing existing package from subversion"
+        /usr/bin/svn rm --force -q "$packagename/repos/$svnrepo_to"
+        /usr/bin/svn commit -q -m "$(basename $0): $packagename removed by $(id -un) for move to $repoto"
+    fi
+
+    echo "    Moving svn entries"
+    /usr/bin/svn mv -r HEAD "$packagename/repos/$svnrepo_from" "$packagename/repos/$svnrepo_to"
+    /usr/bin/svn commit -m "$(basename $0): moved $packagename from [$repofrom] to [$repoto] ($arch)"
+
+    echo "    Moving package file and updating DBs"
+    cd "$WORKDIR"
+    [ -d build/ ] || mkdir build
+    cd build/
+
+    # copy the db file into our working area
+    if [ -f "$ftppath_from/$repofrom.db.tar.$DB_COMPRESSION" ]; then
+        cp "$ftppath_from/$repofrom.db.tar.$DB_COMPRESSION" .
+    else
+        touch "$repofrom.db.tar.$DB_COMPRESSION"
+    fi
+
+    /usr/bin/repo-remove "$repofrom.db.tar.$DB_COMPRESSION" $packagename || die "Error in repo-remove"
+    #use '*' to move the old DB too
+    mv $repofrom.db.tar.$DB_COMPRESSION* $ftppath_from
+    echo "    Package files will be cleaned up automatically"
+
+    if [ -f "$ftppath_to/$repoto.db.tar.$DB_COMPRESSION" ]; then
+        cp "$ftppath_to/$repoto.db.tar.$DB_COMPRESSION" .
+    else
+        touch "$repoto.db.tar.$DB_COMPRESSION"
+    fi
+
+    cp "$ftppath_from/$_pkgfile" .
+    /usr/bin/repo-add "$repoto.db.tar.$DB_COMPRESSION" $_pkgfile || die "Error in repo-add"
+    #use '*' to move the old DB too
+    mv $repoto.db.tar.$DB_COMPRESSION* $_pkgfile $ftppath_to
+else
+    die "Error: $packagename is not in repo $repofrom"
+fi
+
+cleanup
-- 
cgit v1.2.3-2-g168b


From 39eb3c90a2c021dc750467360e07a6dadf7bcbb2 Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaronmgriffin@gmail.com>
Date: Wed, 21 May 2008 00:36:21 -0400
Subject: Make sure to cleanup WORKDIR on exit

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

(limited to 'db-move')

diff --git a/db-move b/db-move
index cb559d2..f8adfc1 100755
--- a/db-move
+++ b/db-move
@@ -37,7 +37,7 @@ LOCKFILE="/tmp/.repolck.$arch.$reponame"
 cleanup() {
 	# unlock
 	rm -f "$LOCKFILE"
-	#rm -rf "$WORKDIR"
+	rm -rf "$WORKDIR"
 	[ "$1" ] && exit $1
 }
 
-- 
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-move | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

(limited to 'db-move')

diff --git a/db-move b/db-move
index f8adfc1..13f2c4e 100755
--- a/db-move
+++ b/db-move
@@ -6,13 +6,9 @@ if [ $# -ne 4 ]; 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"
 repofrom="$2"
@@ -32,11 +28,11 @@ svnrepo_to="$repoto-$arch"
 [ "$UID" = "" ] && UID=$(uid)
 
 WORKDIR="/tmp/db-move.$svnrepo_from.$svnrepo_to.$UID"
-LOCKFILE="/tmp/.repolck.$arch.$reponame"
 
 cleanup() {
 	# unlock
-	rm -f "$LOCKFILE"
+    repo_unlock $repoto $arch
+    repo_unlock $repofrom $arch
 	rm -rf "$WORKDIR"
 	[ "$1" ] && exit $1
 }
@@ -51,16 +47,12 @@ die() {
 	cleanup 1
 }
 
-# check for locks
-if [ -f "$LOCKFILE" ]; then
-	owner="$(/usr/bin/stat -c %U $LOCKFILE)"
-	die "error: db generation is already in progress (started by $owner)"
-fi
-
 trap ctrl_c 2
-trap cleanup 0
+trap cleanup 0 1
+
+repo_lock $repoto $arch
+repo_lock $repofrom $arch
 
-/bin/touch "$LOCKFILE"
 /bin/mkdir -p "$WORKDIR"
 
 cd "$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-move | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'db-move')

diff --git a/db-move b/db-move
index 13f2c4e..c8d30c4 100755
--- a/db-move
+++ b/db-move
@@ -27,7 +27,7 @@ svnrepo_to="$repoto-$arch"
 
 [ "$UID" = "" ] && UID=$(uid)
 
-WORKDIR="/tmp/db-move.$svnrepo_from.$svnrepo_to.$UID"
+WORKDIR="/home/tmp/db-move.$svnrepo_from.$svnrepo_to.$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-move | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'db-move')

diff --git a/db-move b/db-move
index c8d30c4..aee18f2 100755
--- a/db-move
+++ b/db-move
@@ -85,7 +85,7 @@ if [ -d "$packagename/repos/$svnrepo_from" ]; then
 
     # copy the db file into our working area
     if [ -f "$ftppath_from/$repofrom.db.tar.$DB_COMPRESSION" ]; then
-        cp "$ftppath_from/$repofrom.db.tar.$DB_COMPRESSION" .
+        copy_helper "$ftppath_from/$repofrom.db.tar.$DB_COMPRESSION" .
     else
         touch "$repofrom.db.tar.$DB_COMPRESSION"
     fi
@@ -96,12 +96,12 @@ if [ -d "$packagename/repos/$svnrepo_from" ]; then
     echo "    Package files will be cleaned up automatically"
 
     if [ -f "$ftppath_to/$repoto.db.tar.$DB_COMPRESSION" ]; then
-        cp "$ftppath_to/$repoto.db.tar.$DB_COMPRESSION" .
+        copy_helper "$ftppath_to/$repoto.db.tar.$DB_COMPRESSION" .
     else
         touch "$repoto.db.tar.$DB_COMPRESSION"
     fi
 
-    cp "$ftppath_from/$_pkgfile" .
+    copy_helper "$ftppath_from/$_pkgfile" .
     /usr/bin/repo-add "$repoto.db.tar.$DB_COMPRESSION" $_pkgfile || die "Error in repo-add"
     #use '*' to move the old DB too
     mv $repoto.db.tar.$DB_COMPRESSION* $_pkgfile $ftppath_to
-- 
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-move | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'db-move')

diff --git a/db-move b/db-move
index aee18f2..88a8cb6 100755
--- a/db-move
+++ b/db-move
@@ -48,7 +48,7 @@ die() {
 }
 
 trap ctrl_c 2
-trap cleanup 0 1
+trap cleanup 0
 
 repo_lock $repoto $arch
 repo_lock $repofrom $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-move | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'db-move')

diff --git a/db-move b/db-move
index 88a8cb6..5be1813 100755
--- a/db-move
+++ b/db-move
@@ -17,13 +17,10 @@ arch="$4"
 
 export CARCH="$arch"
 
-##### Arch specific stuff. TODO make this configurable #####
-ftppath_from="/home/ftp/$repofrom/os/$arch/"
-ftppath_to="/home/ftp/$repoto/os/$arch/"
-svnpath="file:///home/svn-packages"
+ftppath_from="$FTP_BASE/$repofrom/os/$arch/"
+ftppath_to="$FTP_BASE/$repoto/os/$arch/"
 svnrepo_from="$repofrom-$arch"
 svnrepo_to="$repoto-$arch"
-############################################################
 
 [ "$UID" = "" ] && UID=$(uid)
 
@@ -56,7 +53,7 @@ repo_lock $repofrom $arch
 /bin/mkdir -p "$WORKDIR"
 
 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-move | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'db-move')

diff --git a/db-move b/db-move
index 5be1813..789e536 100755
--- a/db-move
+++ b/db-move
@@ -24,7 +24,7 @@ svnrepo_to="$repoto-$arch"
 
 [ "$UID" = "" ] && UID=$(uid)
 
-WORKDIR="/home/tmp/db-move.$svnrepo_from.$svnrepo_to.$UID"
+WORKDIR="$TMPDIR/db-move.$svnrepo_from.$svnrepo_to.$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-move | 1 +
 1 file changed, 1 insertion(+)

(limited to 'db-move')

diff --git a/db-move b/db-move
index 789e536..8d006f4 100755
--- a/db-move
+++ b/db-move
@@ -27,6 +27,7 @@ svnrepo_to="$repoto-$arch"
 WORKDIR="$TMPDIR/db-move.$svnrepo_from.$svnrepo_to.$UID"
 
 cleanup() {
+    trap '' 0 2
 	# unlock
     repo_unlock $repoto $arch
     repo_unlock $repofrom $arch
-- 
cgit v1.2.3-2-g168b


From 3606df775189459eef24fdec2bad5cab6ccc7ec6 Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaronmgriffin@gmail.com>
Date: Fri, 21 Nov 2008 17:14:10 -0800
Subject: Fix a variable overwrite when sourcing PKGBUILDs

The local variable 'arch' was being overwritten when we
source PKGBUILDs. Change it to _arch wherever we deal
with PKGBUILD files

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

(limited to 'db-move')

diff --git a/db-move b/db-move
index 8d006f4..74e0b0b 100755
--- a/db-move
+++ b/db-move
@@ -13,14 +13,14 @@ source_makepkg
 packagename="$1"
 repofrom="$2"
 repoto="$3"
-arch="$4"
+_arch="$4"
 
-export CARCH="$arch"
+export CARCH="$_arch"
 
-ftppath_from="$FTP_BASE/$repofrom/os/$arch/"
-ftppath_to="$FTP_BASE/$repoto/os/$arch/"
-svnrepo_from="$repofrom-$arch"
-svnrepo_to="$repoto-$arch"
+ftppath_from="$FTP_BASE/$repofrom/os/$_arch/"
+ftppath_to="$FTP_BASE/$repoto/os/$_arch/"
+svnrepo_from="$repofrom-$_arch"
+svnrepo_to="$repoto-$_arch"
 
 [ "$UID" = "" ] && UID=$(uid)
 
@@ -29,8 +29,8 @@ WORKDIR="$TMPDIR/db-move.$svnrepo_from.$svnrepo_to.$UID"
 cleanup() {
     trap '' 0 2
 	# unlock
-    repo_unlock $repoto $arch
-    repo_unlock $repofrom $arch
+    repo_unlock $repoto $_arch
+    repo_unlock $repofrom $_arch
 	rm -rf "$WORKDIR"
 	[ "$1" ] && exit $1
 }
@@ -48,8 +48,8 @@ die() {
 trap ctrl_c 2
 trap cleanup 0
 
-repo_lock $repoto $arch
-repo_lock $repofrom $arch
+repo_lock $repoto $_arch
+repo_lock $repofrom $_arch
 
 /bin/mkdir -p "$WORKDIR"
 
@@ -60,7 +60,7 @@ cd checkout
 /usr/bin/svn up -q $packagename
 if [ -d "$packagename/repos/$svnrepo_from" ]; then
     . "$packagename/repos/$svnrepo_from/$BUILDSCRIPT"
-    _pkgfile="$pkgname-$pkgver-$pkgrel-$CARCH$PKGEXT"
+    _pkgfile="$pkgname-$pkgver-$pkgrel-$_arch$PKGEXT"
 
     if [ ! -f "$ftppath_from/$_pkgfile" ]; then
         die "error: package file '$_pkgfile' not found in repo '$repofrom'"
@@ -74,7 +74,7 @@ if [ -d "$packagename/repos/$svnrepo_from" ]; then
 
     echo "    Moving svn entries"
     /usr/bin/svn mv -r HEAD "$packagename/repos/$svnrepo_from" "$packagename/repos/$svnrepo_to"
-    /usr/bin/svn commit -m "$(basename $0): moved $packagename from [$repofrom] to [$repoto] ($arch)"
+    /usr/bin/svn commit -m "$(basename $0): moved $packagename from [$repofrom] to [$repoto] ($_arch)"
 
     echo "    Moving package file and updating DBs"
     cd "$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-move | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'db-move')

diff --git a/db-move b/db-move
index 74e0b0b..0e0587c 100755
--- a/db-move
+++ b/db-move
@@ -83,7 +83,7 @@ if [ -d "$packagename/repos/$svnrepo_from" ]; then
 
     # copy the db file into our working area
     if [ -f "$ftppath_from/$repofrom.db.tar.$DB_COMPRESSION" ]; then
-        copy_helper "$ftppath_from/$repofrom.db.tar.$DB_COMPRESSION" .
+        /bin/cp "$ftppath_from/$repofrom.db.tar.$DB_COMPRESSION" .
     else
         touch "$repofrom.db.tar.$DB_COMPRESSION"
     fi
@@ -94,12 +94,12 @@ if [ -d "$packagename/repos/$svnrepo_from" ]; then
     echo "    Package files will be cleaned up automatically"
 
     if [ -f "$ftppath_to/$repoto.db.tar.$DB_COMPRESSION" ]; then
-        copy_helper "$ftppath_to/$repoto.db.tar.$DB_COMPRESSION" .
+        /bin/cp "$ftppath_to/$repoto.db.tar.$DB_COMPRESSION" .
     else
         touch "$repoto.db.tar.$DB_COMPRESSION"
     fi
 
-    copy_helper "$ftppath_from/$_pkgfile" .
+    /bin/cp "$ftppath_from/$_pkgfile" .
     /usr/bin/repo-add "$repoto.db.tar.$DB_COMPRESSION" $_pkgfile || die "Error in repo-add"
     #use '*' to move the old DB too
     mv $repoto.db.tar.$DB_COMPRESSION* $_pkgfile $ftppath_to
-- 
cgit v1.2.3-2-g168b


From 87d3436dbd6fe5f3aeb7880d1596aa7a5c6e7905 Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaronmgriffin@gmail.com>
Date: Mon, 1 Dec 2008 19:03:03 -0600
Subject: Cleanup missing db file logic

Do not touch missing db files. Additionally, no
need to call db-remove if the db file doesn't exist

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

(limited to 'db-move')

diff --git a/db-move b/db-move
index 0e0587c..7fab215 100755
--- a/db-move
+++ b/db-move
@@ -84,19 +84,14 @@ if [ -d "$packagename/repos/$svnrepo_from" ]; then
     # copy the db file into our working area
     if [ -f "$ftppath_from/$repofrom.db.tar.$DB_COMPRESSION" ]; then
         /bin/cp "$ftppath_from/$repofrom.db.tar.$DB_COMPRESSION" .
-    else
-        touch "$repofrom.db.tar.$DB_COMPRESSION"
+        /usr/bin/repo-remove "$repofrom.db.tar.$DB_COMPRESSION" $packagename || die "Error in repo-remove"
+        #use '*' to move the old DB too
+        mv $repofrom.db.tar.$DB_COMPRESSION* $ftppath_from
+        echo "    Package files will be cleaned up automatically"
     fi
 
-    /usr/bin/repo-remove "$repofrom.db.tar.$DB_COMPRESSION" $packagename || die "Error in repo-remove"
-    #use '*' to move the old DB too
-    mv $repofrom.db.tar.$DB_COMPRESSION* $ftppath_from
-    echo "    Package files will be cleaned up automatically"
-
     if [ -f "$ftppath_to/$repoto.db.tar.$DB_COMPRESSION" ]; then
         /bin/cp "$ftppath_to/$repoto.db.tar.$DB_COMPRESSION" .
-    else
-        touch "$repoto.db.tar.$DB_COMPRESSION"
     fi
 
     /bin/cp "$ftppath_from/$_pkgfile" .
-- 
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-move | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'db-move')

diff --git a/db-move b/db-move
index 7fab215..ff9677b 100755
--- a/db-move
+++ b/db-move
@@ -84,7 +84,7 @@ if [ -d "$packagename/repos/$svnrepo_from" ]; then
     # copy the db file into our working area
     if [ -f "$ftppath_from/$repofrom.db.tar.$DB_COMPRESSION" ]; then
         /bin/cp "$ftppath_from/$repofrom.db.tar.$DB_COMPRESSION" .
-        /usr/bin/repo-remove "$repofrom.db.tar.$DB_COMPRESSION" $packagename || die "Error in repo-remove"
+        /usr/bin/repo-remove -q "$repofrom.db.tar.$DB_COMPRESSION" $packagename || die "Error in repo-remove"
         #use '*' to move the old DB too
         mv $repofrom.db.tar.$DB_COMPRESSION* $ftppath_from
         echo "    Package files will be cleaned up automatically"
@@ -95,7 +95,7 @@ if [ -d "$packagename/repos/$svnrepo_from" ]; then
     fi
 
     /bin/cp "$ftppath_from/$_pkgfile" .
-    /usr/bin/repo-add "$repoto.db.tar.$DB_COMPRESSION" $_pkgfile || die "Error in repo-add"
+    /usr/bin/repo-add -q "$repoto.db.tar.$DB_COMPRESSION" $_pkgfile || die "Error in repo-add"
     #use '*' to move the old DB too
     mv $repoto.db.tar.$DB_COMPRESSION* $_pkgfile $ftppath_to
 else
-- 
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-move | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'db-move')

diff --git a/db-move b/db-move
index ff9677b..e4f2fef 100755
--- a/db-move
+++ b/db-move
@@ -21,6 +21,11 @@ ftppath_from="$FTP_BASE/$repofrom/os/$_arch/"
 ftppath_to="$FTP_BASE/$repoto/os/$_arch/"
 svnrepo_from="$repofrom-$_arch"
 svnrepo_to="$repoto-$_arch"
+svnpath="$(get_svnpath $repoto)"
+if [ "$svnpath" != "$(get_svnpath $repofrom" ]; then
+    echo "ERROR: Cannot move packages across SVN repos"
+    echo "       A move must be within the same svn repo"
+fi
 
 [ "$UID" = "" ] && UID=$(uid)
 
@@ -54,7 +59,7 @@ repo_lock $repofrom $_arch
 /bin/mkdir -p "$WORKDIR"
 
 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-move | 54 ++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 34 insertions(+), 20 deletions(-)

(limited to 'db-move')

diff --git a/db-move b/db-move
index e4f2fef..0759ba2 100755
--- a/db-move
+++ b/db-move
@@ -17,8 +17,8 @@ _arch="$4"
 
 export CARCH="$_arch"
 
-ftppath_from="$FTP_BASE/$repofrom/os/$_arch/"
-ftppath_to="$FTP_BASE/$repoto/os/$_arch/"
+ftppath_from="$FTP_BASE/$repofrom/os/"
+ftppath_to="$FTP_BASE/$repoto/os/"
 svnrepo_from="$repofrom-$_arch"
 svnrepo_to="$repoto-$_arch"
 svnpath="$(get_svnpath $repoto)"
@@ -67,7 +67,7 @@ if [ -d "$packagename/repos/$svnrepo_from" ]; then
     . "$packagename/repos/$svnrepo_from/$BUILDSCRIPT"
     _pkgfile="$pkgname-$pkgver-$pkgrel-$_arch$PKGEXT"
 
-    if [ ! -f "$ftppath_from/$_pkgfile" ]; then
+    if [ ! -f "$ftppath_from/${_arch}/$_pkgfile" ]; then
         die "error: package file '$_pkgfile' not found in repo '$repofrom'"
     fi
 
@@ -86,23 +86,37 @@ if [ -d "$packagename/repos/$svnrepo_from" ]; then
     [ -d build/ ] || mkdir build
     cd build/
 
-    # copy the db file into our working area
-    if [ -f "$ftppath_from/$repofrom.db.tar.$DB_COMPRESSION" ]; then
-        /bin/cp "$ftppath_from/$repofrom.db.tar.$DB_COMPRESSION" .
-        /usr/bin/repo-remove -q "$repofrom.db.tar.$DB_COMPRESSION" $packagename || die "Error in repo-remove"
-        #use '*' to move the old DB too
-        mv $repofrom.db.tar.$DB_COMPRESSION* $ftppath_from
-        echo "    Package files will be cleaned up automatically"
-    fi
-
-    if [ -f "$ftppath_to/$repoto.db.tar.$DB_COMPRESSION" ]; then
-        /bin/cp "$ftppath_to/$repoto.db.tar.$DB_COMPRESSION" .
-    fi
-
-    /bin/cp "$ftppath_from/$_pkgfile" .
-    /usr/bin/repo-add -q "$repoto.db.tar.$DB_COMPRESSION" $_pkgfile || die "Error in repo-add"
-    #use '*' to move the old DB too
-    mv $repoto.db.tar.$DB_COMPRESSION* $_pkgfile $ftppath_to
+	if [ "${_arch}" == "any" ]; then
+		arches="i686 x86_64"
+	else
+		arches="${_arch}"
+	fi
+
+    for architecture in $arches; do
+		# copy the db file into our working area
+		if [ -f "$ftppath_from/$architecture/$repofrom.db.tar.$DB_COMPRESSION" ]; then
+		    /bin/cp "$ftppath_from/$architecture/$repofrom.db.tar.$DB_COMPRESSION" .
+		    /usr/bin/repo-remove -q "$repofrom.db.tar.$DB_COMPRESSION" $packagename || die "Error in repo-remove"
+		    #use '*' to move the old DB too
+		    mv $repofrom.db.tar.$DB_COMPRESSION* "$ftppath_from/$architecture"
+		    echo "    Package files will be cleaned up automatically"
+		fi
+
+		if [ -f "$ftppath_to/$architecture/$repoto.db.tar.$DB_COMPRESSION" ]; then
+		    /bin/cp "$ftppath_to/$architecture/$repoto.db.tar.$DB_COMPRESSION" .
+		fi
+
+		/bin/cp "$ftppath_from/$architecture/$_pkgfile" .
+		/usr/bin/repo-add -q "$repoto.db.tar.$DB_COMPRESSION" $_pkgfile || die "Error in repo-add"
+		#use '*' to move the old DB too
+		mv $repoto.db.tar.$DB_COMPRESSION* $ftppath_to/$architecture
+		if [ "${_arch}" == "any" ]; then
+			mv ${_pkgfile} $ftppath_to/any
+			ln -s $ftppath_to/any/${_pkgfile} $ftppath_to/$architecture/
+		else
+			mv ${_pkgfile} $ftppath_to/$architecture
+		fi
+	done
 else
     die "Error: $packagename is not in repo $repofrom"
 fi
-- 
cgit v1.2.3-2-g168b


From 277fc975d2f9f6e6e1142af8dd38b3d3af53e903 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 9 Jul 2009 16:56:39 +0200
Subject: fix syntax error

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

(limited to 'db-move')

diff --git a/db-move b/db-move
index 0759ba2..0cc8aa4 100755
--- a/db-move
+++ b/db-move
@@ -22,7 +22,7 @@ ftppath_to="$FTP_BASE/$repoto/os/"
 svnrepo_from="$repofrom-$_arch"
 svnrepo_to="$repoto-$_arch"
 svnpath="$(get_svnpath $repoto)"
-if [ "$svnpath" != "$(get_svnpath $repofrom" ]; then
+if [ "$svnpath" != "$(get_svnpath $repofrom)" ]; then
     echo "ERROR: Cannot move packages across SVN repos"
     echo "       A move must be within the same svn repo"
 fi
-- 
cgit v1.2.3-2-g168b


From 798a2cb73ce68ecb1068be1f5a6e93d54150f0c4 Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaronmgriffin@gmail.com>
Date: Mon, 20 Jul 2009 19:16:53 -0400
Subject: any support: use relative symlinks

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

(limited to 'db-move')

diff --git a/db-move b/db-move
index 0cc8aa4..8200810 100755
--- a/db-move
+++ b/db-move
@@ -112,7 +112,7 @@ if [ -d "$packagename/repos/$svnrepo_from" ]; then
 		mv $repoto.db.tar.$DB_COMPRESSION* $ftppath_to/$architecture
 		if [ "${_arch}" == "any" ]; then
 			mv ${_pkgfile} $ftppath_to/any
-			ln -s $ftppath_to/any/${_pkgfile} $ftppath_to/$architecture/
+			ln -s ../any/${_pkgfile} $ftppath_to/$architecture/
 		else
 			mv ${_pkgfile} $ftppath_to/$architecture
 		fi
-- 
cgit v1.2.3-2-g168b


From f387616777b879a0dfbe801fb609763f72fa0414 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Tue, 21 Jul 2009 18:56:13 +0200
Subject: Add support for split packages to db-move

All split packages are treated as unit and can only be moved together. For split
packages the pkgbase value has to be used to find the corresponding entry in the
svn repository. Note: different architecures (e.g. any) is not supported by
makepkg.

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
---
 db-move | 60 ++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 36 insertions(+), 24 deletions(-)

(limited to 'db-move')

diff --git a/db-move b/db-move
index 8200810..be46dc8 100755
--- a/db-move
+++ b/db-move
@@ -1,8 +1,7 @@
 #!/bin/bash
-# Originally from Pierre's testing2extra script
 
 if [ $# -ne 4 ]; then
-	echo "usage: $(basename $0) <pkgname> <repo-from> <repo-to> <arch>"
+	echo "usage: $(basename $0) <pkgname|packagebase> <repo-from> <repo-to> <arch>"
 	exit 1
 fi
 
@@ -10,7 +9,7 @@ fi
 
 source_makepkg
 
-packagename="$1"
+packagebase="$1"
 repofrom="$2"
 repoto="$3"
 _arch="$4"
@@ -62,24 +61,26 @@ cd "$WORKDIR"
 /usr/bin/svn checkout -N $svnpath checkout
 cd checkout
 
-/usr/bin/svn up -q $packagename
-if [ -d "$packagename/repos/$svnrepo_from" ]; then
-    . "$packagename/repos/$svnrepo_from/$BUILDSCRIPT"
-    _pkgfile="$pkgname-$pkgver-$pkgrel-$_arch$PKGEXT"
-
-    if [ ! -f "$ftppath_from/${_arch}/$_pkgfile" ]; then
-        die "error: package file '$_pkgfile' not found in repo '$repofrom'"
-    fi
-
-    if [ -d "$packagename/repos/$svnrepo_to" ]; then
+/usr/bin/svn up -q $packagebase
+if [ -d "$packagebase/repos/$svnrepo_from" ]; then
+    . "$packagebase/repos/$svnrepo_from/$BUILDSCRIPT"
+    
+    for i in ${pkgname[@]}; do
+        _pkgfile="$i-$pkgver-$pkgrel-$_arch$PKGEXT"
+        if [ ! -f "$ftppath_from/${_arch}/$_pkgfile" ]; then
+            die "error: package file '$_pkgfile' not found in repo '$repofrom'"
+        fi
+    done
+
+    if [ -d "$packagebase/repos/$svnrepo_to" ]; then
         echo "    Removing existing package from subversion"
-        /usr/bin/svn rm --force -q "$packagename/repos/$svnrepo_to"
-        /usr/bin/svn commit -q -m "$(basename $0): $packagename removed by $(id -un) for move to $repoto"
+        /usr/bin/svn rm --force -q "$packagebase/repos/$svnrepo_to"
+        /usr/bin/svn commit -q -m "$(basename $0): $packagebase removed by $(id -un) for move to $repoto"
     fi
 
     echo "    Moving svn entries"
-    /usr/bin/svn mv -r HEAD "$packagename/repos/$svnrepo_from" "$packagename/repos/$svnrepo_to"
-    /usr/bin/svn commit -m "$(basename $0): moved $packagename from [$repofrom] to [$repoto] ($_arch)"
+    /usr/bin/svn mv -r HEAD "$packagebase/repos/$svnrepo_from" "$packagebase/repos/$svnrepo_to"
+    /usr/bin/svn commit -m "$(basename $0): moved $packagebase from [$repofrom] to [$repoto] ($_arch)"
 
     echo "    Moving package file and updating DBs"
     cd "$WORKDIR"
@@ -96,7 +97,9 @@ if [ -d "$packagename/repos/$svnrepo_from" ]; then
 		# copy the db file into our working area
 		if [ -f "$ftppath_from/$architecture/$repofrom.db.tar.$DB_COMPRESSION" ]; then
 		    /bin/cp "$ftppath_from/$architecture/$repofrom.db.tar.$DB_COMPRESSION" .
-		    /usr/bin/repo-remove -q "$repofrom.db.tar.$DB_COMPRESSION" $packagename || die "Error in repo-remove"
+		    for i in ${pkgname[@]}; do
+			/usr/bin/repo-remove -q "$repofrom.db.tar.$DB_COMPRESSION" $i || die "Error in repo-remove $i"
+		    done
 		    #use '*' to move the old DB too
 		    mv $repofrom.db.tar.$DB_COMPRESSION* "$ftppath_from/$architecture"
 		    echo "    Package files will be cleaned up automatically"
@@ -106,19 +109,28 @@ if [ -d "$packagename/repos/$svnrepo_from" ]; then
 		    /bin/cp "$ftppath_to/$architecture/$repoto.db.tar.$DB_COMPRESSION" .
 		fi
 
-		/bin/cp "$ftppath_from/$architecture/$_pkgfile" .
-		/usr/bin/repo-add -q "$repoto.db.tar.$DB_COMPRESSION" $_pkgfile || die "Error in repo-add"
+		for i in ${pkgname[@]}; do
+			_pkgfile="$i-$pkgver-$pkgrel-$_arch$PKGEXT"
+			/bin/cp "$ftppath_from/$architecture/$_pkgfile" .
+			/usr/bin/repo-add -q "$repoto.db.tar.$DB_COMPRESSION" $_pkgfile || die "Error in repo-add $_pkgfile"
+		done
 		#use '*' to move the old DB too
 		mv $repoto.db.tar.$DB_COMPRESSION* $ftppath_to/$architecture
 		if [ "${_arch}" == "any" ]; then
-			mv ${_pkgfile} $ftppath_to/any
-			ln -s ../any/${_pkgfile} $ftppath_to/$architecture/
+			for i in ${pkgname[@]}; do
+				_pkgfile="$i-$pkgver-$pkgrel-$_arch$PKGEXT"
+				mv ${_pkgfile} $ftppath_to/any
+				ln -s ../any/${_pkgfile} $ftppath_to/$architecture/
+			done
 		else
-			mv ${_pkgfile} $ftppath_to/$architecture
+			for i in ${pkgname[@]}; do
+				_pkgfile="$i-$pkgver-$pkgrel-$_arch$PKGEXT"
+				mv ${_pkgfile} $ftppath_to/$architecture
+			done
 		fi
 	done
 else
-    die "Error: $packagename is not in repo $repofrom"
+    die "Error: $packagebase is not in repo $repofrom"
 fi
 
 cleanup
-- 
cgit v1.2.3-2-g168b


From 8df23b9ed44bfffbf84522d4e49b81edb4a72b41 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Tue, 21 Jul 2009 12:53:39 -0700
Subject: db-move: reduce usage of loops

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

(limited to 'db-move')

diff --git a/db-move b/db-move
index be46dc8..4dbec07 100755
--- a/db-move
+++ b/db-move
@@ -97,9 +97,7 @@ if [ -d "$packagebase/repos/$svnrepo_from" ]; then
 		# copy the db file into our working area
 		if [ -f "$ftppath_from/$architecture/$repofrom.db.tar.$DB_COMPRESSION" ]; then
 		    /bin/cp "$ftppath_from/$architecture/$repofrom.db.tar.$DB_COMPRESSION" .
-		    for i in ${pkgname[@]}; do
-			/usr/bin/repo-remove -q "$repofrom.db.tar.$DB_COMPRESSION" $i || die "Error in repo-remove $i"
-		    done
+		    /usr/bin/repo-remove -q "$repofrom.db.tar.$DB_COMPRESSION" ${pkgname[@]} || die "Error in repo-remove"
 		    #use '*' to move the old DB too
 		    mv $repofrom.db.tar.$DB_COMPRESSION* "$ftppath_from/$architecture"
 		    echo "    Package files will be cleaned up automatically"
@@ -116,18 +114,15 @@ if [ -d "$packagebase/repos/$svnrepo_from" ]; then
 		done
 		#use '*' to move the old DB too
 		mv $repoto.db.tar.$DB_COMPRESSION* $ftppath_to/$architecture
-		if [ "${_arch}" == "any" ]; then
-			for i in ${pkgname[@]}; do
-				_pkgfile="$i-$pkgver-$pkgrel-$_arch$PKGEXT"
-				mv ${_pkgfile} $ftppath_to/any
-				ln -s ../any/${_pkgfile} $ftppath_to/$architecture/
-			done
-		else
-			for i in ${pkgname[@]}; do
-				_pkgfile="$i-$pkgver-$pkgrel-$_arch$PKGEXT"
-				mv ${_pkgfile} $ftppath_to/$architecture
-			done
-		fi
+        for i in ${pkgname[@]}; do
+            _pkgfile="$i-$pkgver-$pkgrel-$_arch$PKGEXT"
+            if [ "${_arch}" == "any" ]; then
+                mv ${_pkgfile} $ftppath_to/any
+                ln -s ../any/${_pkgfile} $ftppath_to/$architecture/
+            else
+                mv ${_pkgfile} $ftppath_to/$architecture
+            fi
+        done
 	done
 else
     die "Error: $packagebase is not in repo $repofrom"
-- 
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-move | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'db-move')

diff --git a/db-move b/db-move
index 4dbec07..e3897e3 100755
--- a/db-move
+++ b/db-move
@@ -20,11 +20,6 @@ ftppath_from="$FTP_BASE/$repofrom/os/"
 ftppath_to="$FTP_BASE/$repoto/os/"
 svnrepo_from="$repofrom-$_arch"
 svnrepo_to="$repoto-$_arch"
-svnpath="$(get_svnpath $repoto)"
-if [ "$svnpath" != "$(get_svnpath $repofrom)" ]; then
-    echo "ERROR: Cannot move packages across SVN repos"
-    echo "       A move must be within the same svn repo"
-fi
 
 [ "$UID" = "" ] && UID=$(uid)
 
@@ -58,7 +53,7 @@ repo_lock $repofrom $_arch
 /bin/mkdir -p "$WORKDIR"
 
 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-move | 1 +
 1 file changed, 1 insertion(+)

(limited to 'db-move')

diff --git a/db-move b/db-move
index e3897e3..1b07091 100755
--- a/db-move
+++ b/db-move
@@ -13,6 +13,7 @@ packagebase="$1"
 repofrom="$2"
 repoto="$3"
 _arch="$4"
+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-move | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'db-move')

diff --git a/db-move b/db-move
index 1b07091..e1a50bd 100755
--- a/db-move
+++ b/db-move
@@ -13,7 +13,6 @@ packagebase="$1"
 repofrom="$2"
 repoto="$3"
 _arch="$4"
-DB_COMPRESSION='gz'
 
 export CARCH="$_arch"
 
@@ -91,25 +90,25 @@ if [ -d "$packagebase/repos/$svnrepo_from" ]; then
 
     for architecture in $arches; do
 		# copy the db file into our working area
-		if [ -f "$ftppath_from/$architecture/$repofrom.db.tar.$DB_COMPRESSION" ]; then
-		    /bin/cp "$ftppath_from/$architecture/$repofrom.db.tar.$DB_COMPRESSION" .
-		    /usr/bin/repo-remove -q "$repofrom.db.tar.$DB_COMPRESSION" ${pkgname[@]} || die "Error in repo-remove"
+		if [ -f "$ftppath_from/$architecture/$repofrom$DBEXT" ]; then
+		    /bin/cp "$ftppath_from/$architecture/$repofrom$DBEXT" .
+		    /usr/bin/repo-remove -q "$repofrom$DBEXT" ${pkgname[@]} || die "Error in repo-remove"
 		    #use '*' to move the old DB too
-		    mv $repofrom.db.tar.$DB_COMPRESSION* "$ftppath_from/$architecture"
+		    mv $repofrom$DBEXT"$ftppath_from/$architecture"
 		    echo "    Package files will be cleaned up automatically"
 		fi
 
-		if [ -f "$ftppath_to/$architecture/$repoto.db.tar.$DB_COMPRESSION" ]; then
-		    /bin/cp "$ftppath_to/$architecture/$repoto.db.tar.$DB_COMPRESSION" .
+		if [ -f "$ftppath_to/$architecture/$repoto$DBEXT" ]; then
+		    /bin/cp "$ftppath_to/$architecture/$repoto$DBEXT" .
 		fi
 
 		for i in ${pkgname[@]}; do
 			_pkgfile="$i-$pkgver-$pkgrel-$_arch$PKGEXT"
 			/bin/cp "$ftppath_from/$architecture/$_pkgfile" .
-			/usr/bin/repo-add -q "$repoto.db.tar.$DB_COMPRESSION" $_pkgfile || die "Error in repo-add $_pkgfile"
+			/usr/bin/repo-add -q "$repoto$DBEXT" $_pkgfile || die "Error in repo-add $_pkgfile"
 		done
 		#use '*' to move the old DB too
-		mv $repoto.db.tar.$DB_COMPRESSION* $ftppath_to/$architecture
+		mv $repoto$DBEXT* $ftppath_to/$architecture
         for i in ${pkgname[@]}; do
             _pkgfile="$i-$pkgver-$pkgrel-$_arch$PKGEXT"
             if [ "${_arch}" == "any" ]; then
-- 
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-move | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'db-move')

diff --git a/db-move b/db-move
index e1a50bd..de81e85 100755
--- a/db-move
+++ b/db-move
@@ -7,15 +7,11 @@ fi
 
 . "$(dirname $0)/db-functions"
 
-source_makepkg
-
 packagebase="$1"
 repofrom="$2"
 repoto="$3"
 _arch="$4"
 
-export CARCH="$_arch"
-
 ftppath_from="$FTP_BASE/$repofrom/os/"
 ftppath_to="$FTP_BASE/$repoto/os/"
 svnrepo_from="$repofrom-$_arch"
-- 
cgit v1.2.3-2-g168b


From fa9fe91849e46ea50cd32cc55539a4f0833eb642 Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaronmgriffin@gmail.com>
Date: Mon, 17 Aug 2009 15:26:02 -0700
Subject: Fix an error in db-move due to DBEXT commit

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

(limited to 'db-move')

diff --git a/db-move b/db-move
index de81e85..b49aeda 100755
--- a/db-move
+++ b/db-move
@@ -90,7 +90,7 @@ if [ -d "$packagebase/repos/$svnrepo_from" ]; then
 		    /bin/cp "$ftppath_from/$architecture/$repofrom$DBEXT" .
 		    /usr/bin/repo-remove -q "$repofrom$DBEXT" ${pkgname[@]} || die "Error in repo-remove"
 		    #use '*' to move the old DB too
-		    mv $repofrom$DBEXT"$ftppath_from/$architecture"
+		    mv $repofrom$DBEXT* "$ftppath_from/$architecture"
 		    echo "    Package files will be cleaned up automatically"
 		fi
 
-- 
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-move | 1 +
 1 file changed, 1 insertion(+)

(limited to 'db-move')

diff --git a/db-move b/db-move
index b49aeda..efd54e0 100755
--- a/db-move
+++ b/db-move
@@ -6,6 +6,7 @@ if [ $# -ne 4 ]; then
 fi
 
 . "$(dirname $0)/db-functions"
+. "$(dirname $0)/config"
 
 packagebase="$1"
 repofrom="$2"
-- 
cgit v1.2.3-2-g168b


From de0c93a652333b242e7ea282110619f25de7be8d Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 21 Feb 2010 16:54:10 +0100
Subject: Accept any *.pkg.tar.* package file name

With this patch packages with different compressions are accepted. It is
ensured that one cannot have the same package with different compression
extensions.

The new functions getpkgfile{,s} are used to sanitize globed filenames.

Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
---
 db-move | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'db-move')

diff --git a/db-move b/db-move
index efd54e0..c5bd32e 100755
--- a/db-move
+++ b/db-move
@@ -59,9 +59,7 @@ if [ -d "$packagebase/repos/$svnrepo_from" ]; then
     
     for i in ${pkgname[@]}; do
         _pkgfile="$i-$pkgver-$pkgrel-$_arch$PKGEXT"
-        if [ ! -f "$ftppath_from/${_arch}/$_pkgfile" ]; then
-            die "error: package file '$_pkgfile' not found in repo '$repofrom'"
-        fi
+        getpkgfile "$ftppath_from/${_arch}/"$_pkgfile >/dev/null
     done
 
     if [ -d "$packagebase/repos/$svnrepo_to" ]; then
@@ -101,13 +99,16 @@ if [ -d "$packagebase/repos/$svnrepo_from" ]; then
 
 		for i in ${pkgname[@]}; do
 			_pkgfile="$i-$pkgver-$pkgrel-$_arch$PKGEXT"
-			/bin/cp "$ftppath_from/$architecture/$_pkgfile" .
+			_cpkgfile=$(getpkgfile "$ftppath_from/$architecture/"$_pkgfile)
+			[ $? -gt 0 ] && die
+			/bin/cp $_cpkgfile .
 			/usr/bin/repo-add -q "$repoto$DBEXT" $_pkgfile || die "Error in repo-add $_pkgfile"
 		done
 		#use '*' to move the old DB too
 		mv $repoto$DBEXT* $ftppath_to/$architecture
         for i in ${pkgname[@]}; do
-            _pkgfile="$i-$pkgver-$pkgrel-$_arch$PKGEXT"
+            _pkgfile=$(getpkgfile "$i-$pkgver-$pkgrel-$_arch"$PKGEXT)
+            [ $? -gt 0 ] && die
             if [ "${_arch}" == "any" ]; then
                 mv ${_pkgfile} $ftppath_to/any
                 ln -s ../any/${_pkgfile} $ftppath_to/$architecture/
-- 
cgit v1.2.3-2-g168b


From 57987ae42fb58c58e044bfd7d3486010b32bb313 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Wed, 31 Mar 2010 23:09:57 +0200
Subject: don't publish *.old files

---
 db-move | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'db-move')

diff --git a/db-move b/db-move
index c5bd32e..ca1b5da 100755
--- a/db-move
+++ b/db-move
@@ -88,8 +88,7 @@ if [ -d "$packagebase/repos/$svnrepo_from" ]; then
 		if [ -f "$ftppath_from/$architecture/$repofrom$DBEXT" ]; then
 		    /bin/cp "$ftppath_from/$architecture/$repofrom$DBEXT" .
 		    /usr/bin/repo-remove -q "$repofrom$DBEXT" ${pkgname[@]} || die "Error in repo-remove"
-		    #use '*' to move the old DB too
-		    mv $repofrom$DBEXT* "$ftppath_from/$architecture"
+		    mv $repofrom$DBEXT "$ftppath_from/$architecture"
 		    echo "    Package files will be cleaned up automatically"
 		fi
 
@@ -104,8 +103,7 @@ if [ -d "$packagebase/repos/$svnrepo_from" ]; then
 			/bin/cp $_cpkgfile .
 			/usr/bin/repo-add -q "$repoto$DBEXT" $_pkgfile || die "Error in repo-add $_pkgfile"
 		done
-		#use '*' to move the old DB too
-		mv $repoto$DBEXT* $ftppath_to/$architecture
+		mv $repoto$DBEXT $ftppath_to/$architecture
         for i in ${pkgname[@]}; do
             _pkgfile=$(getpkgfile "$i-$pkgver-$pkgrel-$_arch"$PKGEXT)
             [ $? -gt 0 ] && die
-- 
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-move | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'db-move')

diff --git a/db-move b/db-move
index ca1b5da..ed3df69 100755
--- a/db-move
+++ b/db-move
@@ -44,8 +44,8 @@ die() {
 trap ctrl_c 2
 trap cleanup 0
 
-repo_lock $repoto $_arch
-repo_lock $repofrom $_arch
+repo_lock $repoto $_arch || exit 1
+repo_lock $repofrom $_arch || exit 1
 
 /bin/mkdir -p "$WORKDIR"
 
-- 
cgit v1.2.3-2-g168b


From c81c0e57ff41bbc51e13600b8581145b34aef55f Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 7 Aug 2010 23:49:01 +0200
Subject: Rewrite db-move

* Cleanup code
* create symlinks instead of copies
* Moving split packages is now (more) atomic
* Move old packages to pool if needed
---
 db-move | 97 +++++++++++++++++++++++++----------------------------------------
 1 file changed, 37 insertions(+), 60 deletions(-)

(limited to 'db-move')

diff --git a/db-move b/db-move
index ed3df69..407027a 100755
--- a/db-move
+++ b/db-move
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [ $# -ne 4 ]; then
-	echo "usage: $(basename $0) <pkgname|packagebase> <repo-from> <repo-to> <arch>"
+	echo "usage: $(basename $0) <pkgname|pkgbase> <repo-from> <repo-to> <arch>"
 	exit 1
 fi
 
@@ -12,6 +12,11 @@ packagebase="$1"
 repofrom="$2"
 repoto="$3"
 _arch="$4"
+if [ "${_arch}" == 'any' ]; then
+	_tarches=('i686' 'x86_64')
+else
+	_tarches=("${_arch}")
+fi
 
 ftppath_from="$FTP_BASE/$repofrom/os/"
 ftppath_to="$FTP_BASE/$repoto/os/"
@@ -23,10 +28,10 @@ svnrepo_to="$repoto-$_arch"
 WORKDIR="$TMPDIR/db-move.$svnrepo_from.$svnrepo_to.$UID"
 
 cleanup() {
-    trap '' 0 2
+	trap '' 0 2
 	# unlock
-    repo_unlock $repoto $_arch
-    repo_unlock $repofrom $_arch
+	repo_unlock $repoto $_arch
+	repo_unlock $repofrom $_arch
 	rm -rf "$WORKDIR"
 	[ "$1" ] && exit $1
 }
@@ -55,68 +60,40 @@ cd checkout
 
 /usr/bin/svn up -q $packagebase
 if [ -d "$packagebase/repos/$svnrepo_from" ]; then
-    . "$packagebase/repos/$svnrepo_from/$BUILDSCRIPT"
-    
-    for i in ${pkgname[@]}; do
-        _pkgfile="$i-$pkgver-$pkgrel-$_arch$PKGEXT"
-        getpkgfile "$ftppath_from/${_arch}/"$_pkgfile >/dev/null
-    done
-
-    if [ -d "$packagebase/repos/$svnrepo_to" ]; then
-        echo "    Removing existing package from subversion"
-        /usr/bin/svn rm --force -q "$packagebase/repos/$svnrepo_to"
-        /usr/bin/svn commit -q -m "$(basename $0): $packagebase removed by $(id -un) for move to $repoto"
-    fi
-
-    echo "    Moving svn entries"
-    /usr/bin/svn mv -r HEAD "$packagebase/repos/$svnrepo_from" "$packagebase/repos/$svnrepo_to"
-    /usr/bin/svn commit -m "$(basename $0): moved $packagebase from [$repofrom] to [$repoto] ($_arch)"
-
-    echo "    Moving package file and updating DBs"
-    cd "$WORKDIR"
-    [ -d build/ ] || mkdir build
-    cd build/
-
-	if [ "${_arch}" == "any" ]; then
-		arches="i686 x86_64"
-	else
-		arches="${_arch}"
+	. "$packagebase/repos/$svnrepo_from/$BUILDSCRIPT"
+
+	if [ -d "$packagebase/repos/$svnrepo_to" ]; then
+		echo "    Removing existing package from subversion"
+		/usr/bin/svn rm --force -q "$packagebase/repos/$svnrepo_to"
+		/usr/bin/svn commit -q -m "$(basename $0): $packagebase removed by $(id -un) for move to $repoto"
 	fi
 
-    for architecture in $arches; do
-		# copy the db file into our working area
-		if [ -f "$ftppath_from/$architecture/$repofrom$DBEXT" ]; then
-		    /bin/cp "$ftppath_from/$architecture/$repofrom$DBEXT" .
-		    /usr/bin/repo-remove -q "$repofrom$DBEXT" ${pkgname[@]} || die "Error in repo-remove"
-		    mv $repofrom$DBEXT "$ftppath_from/$architecture"
-		    echo "    Package files will be cleaned up automatically"
-		fi
+	echo "    Moving svn entries"
+	/usr/bin/svn mv -r HEAD "$packagebase/repos/$svnrepo_from" "$packagebase/repos/$svnrepo_to"
+	/usr/bin/svn commit -m "$(basename $0): moved $packagebase from [$repofrom] to [$repoto] ($_arch)"
+
+	_pkgfiles=''
+	for i in ${pkgname[@]}; do
+		_pkgpath=$(getpkgfile "$ftppath_from/${_arch}/"$i-$pkgver-$pkgrel-$_arch$PKGEXT)
+		_pkgfile=$(basename "${_pkgpath}")
 
-		if [ -f "$ftppath_to/$architecture/$repoto$DBEXT" ]; then
-		    /bin/cp "$ftppath_to/$architecture/$repoto$DBEXT" .
+		# copy package to pool if needed
+		# TODO: can be removed once every package has benn moved to the package pool
+		if [ ! -f $FTP_BASE/$(get_pkgpool_for_host)/${_arch}/$_pkgfile ]; then
+			cp $_pkgpath $FTP_BASE/$(get_pkgpool_for_host)/${_arch}/
 		fi
 
-		for i in ${pkgname[@]}; do
-			_pkgfile="$i-$pkgver-$pkgrel-$_arch$PKGEXT"
-			_cpkgfile=$(getpkgfile "$ftppath_from/$architecture/"$_pkgfile)
-			[ $? -gt 0 ] && die
-			/bin/cp $_cpkgfile .
-			/usr/bin/repo-add -q "$repoto$DBEXT" $_pkgfile || die "Error in repo-add $_pkgfile"
+		for _tarch in ${_tarches[@]}; do
+			ln -s "../../../$(get_pkgpool_for_host)/${_arch}/${_pkgfile}" $ftppath_to/${_tarch}/
 		done
-		mv $repoto$DBEXT $ftppath_to/$architecture
-        for i in ${pkgname[@]}; do
-            _pkgfile=$(getpkgfile "$i-$pkgver-$pkgrel-$_arch"$PKGEXT)
-            [ $? -gt 0 ] && die
-            if [ "${_arch}" == "any" ]; then
-                mv ${_pkgfile} $ftppath_to/any
-                ln -s ../any/${_pkgfile} $ftppath_to/$architecture/
-            else
-                mv ${_pkgfile} $ftppath_to/$architecture
-            fi
-        done
+
+		_pkgfiles="${_pkgfiles} $FTP_BASE/$(get_pkgpool_for_host)/${_arch}/${_pkgfile}"
+	done
+
+	for _tarch in ${_tarches[@]}; do
+		/usr/bin/repo-add -q "$ftppath_to/${_tarch}/$repoto$DBEXT" ${_pkgfiles} || die "Error in repo-add $_pkgfiles"
+		/usr/bin/repo-remove -q "$ftppath_from/${_tarch}/$repofrom$DBEXT" ${pkgname[@]} || die "Error in repo-remove ${pkgname[@]}"
 	done
 else
-    die "Error: $packagebase is not in repo $repofrom"
+	die "Error: $packagebase is not in repo $repofrom"
 fi
-
-cleanup
-- 
cgit v1.2.3-2-g168b


From 23d4669b8e330d131b2f78cd5858b30a07478c8a Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 8 Aug 2010 00:33:46 +0200
Subject: Use package pool instead of $repo/os/any dirs

---
 db-move | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'db-move')

diff --git a/db-move b/db-move
index 407027a..8609459 100755
--- a/db-move
+++ b/db-move
@@ -74,16 +74,15 @@ if [ -d "$packagebase/repos/$svnrepo_from" ]; then
 
 	_pkgfiles=''
 	for i in ${pkgname[@]}; do
-		_pkgpath=$(getpkgfile "$ftppath_from/${_arch}/"$i-$pkgver-$pkgrel-$_arch$PKGEXT)
-		_pkgfile=$(basename "${_pkgpath}")
-
-		# copy package to pool if needed
-		# TODO: can be removed once every package has benn moved to the package pool
-		if [ ! -f $FTP_BASE/$(get_pkgpool_for_host)/${_arch}/$_pkgfile ]; then
-			cp $_pkgpath $FTP_BASE/$(get_pkgpool_for_host)/${_arch}/
-		fi
-
 		for _tarch in ${_tarches[@]}; do
+			_pkgpath=$(getpkgfile "$ftppath_from/${_tarch}/"$i-$pkgver-$pkgrel-$_arch$PKGEXT)
+			_pkgfile=$(basename "${_pkgpath}")
+
+			# copy package to pool if needed
+			# TODO: can be removed once every package has been moved to the package pool
+			if [ ! -f $FTP_BASE/$(get_pkgpool_for_host)/${_arch}/$_pkgfile ]; then
+				cp $_pkgpath $FTP_BASE/$(get_pkgpool_for_host)/${_arch}/
+			fi
 			ln -s "../../../$(get_pkgpool_for_host)/${_arch}/${_pkgfile}" $ftppath_to/${_tarch}/
 		done
 
-- 
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-move | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'db-move')

diff --git a/db-move b/db-move
index 8609459..7dff563 100755
--- a/db-move
+++ b/db-move
@@ -55,22 +55,21 @@ repo_lock $repofrom $_arch || exit 1
 /bin/mkdir -p "$WORKDIR"
 
 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_from" ]; then
 	. "$packagebase/repos/$svnrepo_from/$BUILDSCRIPT"
 
+	echo -n "Moving $packagebase from $repofrom to $repoto..."
 	if [ -d "$packagebase/repos/$svnrepo_to" ]; then
-		echo "    Removing existing package from subversion"
 		/usr/bin/svn rm --force -q "$packagebase/repos/$svnrepo_to"
 		/usr/bin/svn commit -q -m "$(basename $0): $packagebase removed by $(id -un) for move to $repoto"
 	fi
 
-	echo "    Moving svn entries"
-	/usr/bin/svn mv -r HEAD "$packagebase/repos/$svnrepo_from" "$packagebase/repos/$svnrepo_to"
-	/usr/bin/svn commit -m "$(basename $0): moved $packagebase from [$repofrom] to [$repoto] ($_arch)"
+	/usr/bin/svn mv -q -r HEAD "$packagebase/repos/$svnrepo_from" "$packagebase/repos/$svnrepo_to"
+	/usr/bin/svn commit -q -m "$(basename $0): moved $packagebase from [$repofrom] to [$repoto] ($_arch)"
 
 	_pkgfiles=''
 	for i in ${pkgname[@]}; do
@@ -90,9 +89,11 @@ if [ -d "$packagebase/repos/$svnrepo_from" ]; then
 	done
 
 	for _tarch in ${_tarches[@]}; do
-		/usr/bin/repo-add -q "$ftppath_to/${_tarch}/$repoto$DBEXT" ${_pkgfiles} || die "Error in repo-add $_pkgfiles"
-		/usr/bin/repo-remove -q "$ftppath_from/${_tarch}/$repofrom$DBEXT" ${pkgname[@]} || die "Error in repo-remove ${pkgname[@]}"
+		/usr/bin/repo-add -q "$ftppath_to/${_tarch}/$repoto$DBEXT" ${_pkgfiles} >/dev/null || die "Error in repo-add $_pkgfiles"
+		/usr/bin/repo-remove -q "$ftppath_from/${_tarch}/$repofrom$DBEXT" ${pkgname[@]} >/dev/null || die "Error in repo-remove ${pkgname[@]}"
 	done
+
+	echo 'done'
 else
 	die "Error: $packagebase is not in repo $repofrom"
 fi
-- 
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-move | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'db-move')

diff --git a/db-move b/db-move
index 7dff563..8347a18 100755
--- a/db-move
+++ b/db-move
@@ -60,7 +60,7 @@ cd checkout
 
 /usr/bin/svn up -q $packagebase
 if [ -d "$packagebase/repos/$svnrepo_from" ]; then
-	. "$packagebase/repos/$svnrepo_from/$BUILDSCRIPT"
+	. "$packagebase/repos/$svnrepo_from/PKGBUILD"
 
 	echo -n "Moving $packagebase from $repofrom to $repoto..."
 	if [ -d "$packagebase/repos/$svnrepo_to" ]; then
-- 
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-move | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'db-move')

diff --git a/db-move b/db-move
index 8347a18..8b15831 100755
--- a/db-move
+++ b/db-move
@@ -23,10 +23,6 @@ ftppath_to="$FTP_BASE/$repoto/os/"
 svnrepo_from="$repofrom-$_arch"
 svnrepo_to="$repoto-$_arch"
 
-[ "$UID" = "" ] && UID=$(uid)
-
-WORKDIR="$TMPDIR/db-move.$svnrepo_from.$svnrepo_to.$UID"
-
 cleanup() {
 	trap '' 0 2
 	# unlock
@@ -52,8 +48,6 @@ trap cleanup 0
 repo_lock $repoto $_arch || exit 1
 repo_lock $repofrom $_arch || exit 1
 
-/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-move | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

(limited to 'db-move')

diff --git a/db-move b/db-move
index 8b15831..b846e79 100755
--- a/db-move
+++ b/db-move
@@ -23,28 +23,6 @@ ftppath_to="$FTP_BASE/$repoto/os/"
 svnrepo_from="$repofrom-$_arch"
 svnrepo_to="$repoto-$_arch"
 
-cleanup() {
-	trap '' 0 2
-	# unlock
-	repo_unlock $repoto $_arch
-	repo_unlock $repofrom $_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 $repoto $_arch || exit 1
 repo_lock $repofrom $_arch || exit 1
 
@@ -91,3 +69,6 @@ if [ -d "$packagebase/repos/$svnrepo_from" ]; then
 else
 	die "Error: $packagebase is not in repo $repofrom"
 fi
+
+repo_unlock $repoto $_arch || exit 1
+repo_unlock $repofrom $_arch || exit 1
-- 
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-move | 48 +++++++++++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 23 deletions(-)

(limited to 'db-move')

diff --git a/db-move b/db-move
index b846e79..bbe7ff7 100755
--- a/db-move
+++ b/db-move
@@ -11,20 +11,20 @@ fi
 packagebase="$1"
 repofrom="$2"
 repoto="$3"
-_arch="$4"
-if [ "${_arch}" == 'any' ]; then
-	_tarches=('i686' 'x86_64')
+arch="$4"
+if [ "${arch}" == 'any' ]; then
+	tarches=('i686' 'x86_64')
 else
-	_tarches=("${_arch}")
+	tarches=("${arch}")
 fi
 
 ftppath_from="$FTP_BASE/$repofrom/os/"
 ftppath_to="$FTP_BASE/$repoto/os/"
-svnrepo_from="$repofrom-$_arch"
-svnrepo_to="$repoto-$_arch"
+svnrepo_from="$repofrom-$arch"
+svnrepo_to="$repoto-$arch"
 
-repo_lock $repoto $_arch || exit 1
-repo_lock $repofrom $_arch || exit 1
+repo_lock $repoto $arch || exit 1
+repo_lock $repofrom $arch || exit 1
 
 cd "$WORKDIR"
 /usr/bin/svn checkout -q -N $SVNREPO checkout >/dev/null
@@ -32,7 +32,9 @@ cd checkout
 
 /usr/bin/svn up -q $packagebase
 if [ -d "$packagebase/repos/$svnrepo_from" ]; then
-	. "$packagebase/repos/$svnrepo_from/PKGBUILD"
+	pkgname=($(. "$packagebase/repos/$svnrepo_from/PKGBUILD"; echo ${pkgname[@]}))
+	pkgver=$(. "$packagebase/repos/$svnrepo_from/PKGBUILD"; echo ${pkgver})
+	pkgrel=$(. "$packagebase/repos/$svnrepo_from/PKGBUILD"; echo ${pkgrel})
 
 	echo -n "Moving $packagebase from $repofrom to $repoto..."
 	if [ -d "$packagebase/repos/$svnrepo_to" ]; then
@@ -41,28 +43,28 @@ if [ -d "$packagebase/repos/$svnrepo_from" ]; then
 	fi
 
 	/usr/bin/svn mv -q -r HEAD "$packagebase/repos/$svnrepo_from" "$packagebase/repos/$svnrepo_to"
-	/usr/bin/svn commit -q -m "$(basename $0): moved $packagebase from [$repofrom] to [$repoto] ($_arch)"
+	/usr/bin/svn commit -q -m "$(basename $0): moved $packagebase from [$repofrom] to [$repoto] ($arch)"
 
-	_pkgfiles=''
+	pkgfiles=''
 	for i in ${pkgname[@]}; do
-		for _tarch in ${_tarches[@]}; do
-			_pkgpath=$(getpkgfile "$ftppath_from/${_tarch}/"$i-$pkgver-$pkgrel-$_arch$PKGEXT)
-			_pkgfile=$(basename "${_pkgpath}")
+		for tarch in ${tarches[@]}; do
+			pkgpath=$(getpkgfile "$ftppath_from/${tarch}/"$i-$pkgver-$pkgrel-$arch$PKGEXT)
+			pkgfile=$(basename "${pkgpath}")
 
 			# copy package to pool if needed
 			# TODO: can be removed once every package has been moved to the package pool
-			if [ ! -f $FTP_BASE/$(get_pkgpool_for_host)/${_arch}/$_pkgfile ]; then
-				cp $_pkgpath $FTP_BASE/$(get_pkgpool_for_host)/${_arch}/
+			if [ ! -f $FTP_BASE/$(get_pkgpool_for_host)/${arch}/$pkgfile ]; then
+				cp $pkgpath $FTP_BASE/$(get_pkgpool_for_host)/${arch}/
 			fi
-			ln -s "../../../$(get_pkgpool_for_host)/${_arch}/${_pkgfile}" $ftppath_to/${_tarch}/
+			ln -s "../../../$(get_pkgpool_for_host)/${arch}/${pkgfile}" $ftppath_to/${tarch}/
 		done
 
-		_pkgfiles="${_pkgfiles} $FTP_BASE/$(get_pkgpool_for_host)/${_arch}/${_pkgfile}"
+		pkgfiles="${pkgfiles} $FTP_BASE/$(get_pkgpool_for_host)/${arch}/${pkgfile}"
 	done
 
-	for _tarch in ${_tarches[@]}; do
-		/usr/bin/repo-add -q "$ftppath_to/${_tarch}/$repoto$DBEXT" ${_pkgfiles} >/dev/null || die "Error in repo-add $_pkgfiles"
-		/usr/bin/repo-remove -q "$ftppath_from/${_tarch}/$repofrom$DBEXT" ${pkgname[@]} >/dev/null || die "Error in repo-remove ${pkgname[@]}"
+	for tarch in ${tarches[@]}; do
+		/usr/bin/repo-add -q "$ftppath_to/${tarch}/$repoto$DBEXT" ${pkgfiles} >/dev/null || die "Error in repo-add $pkgfiles"
+		/usr/bin/repo-remove -q "$ftppath_from/${tarch}/$repofrom$DBEXT" ${pkgname[@]} >/dev/null || die "Error in repo-remove ${pkgname[@]}"
 	done
 
 	echo 'done'
@@ -70,5 +72,5 @@ else
 	die "Error: $packagebase is not in repo $repofrom"
 fi
 
-repo_unlock $repoto $_arch || exit 1
-repo_unlock $repofrom $_arch || exit 1
+repo_unlock $repoto $arch || exit 1
+repo_unlock $repofrom $arch || exit 1
-- 
cgit v1.2.3-2-g168b


From af4f86808e8cd45cc171f55a1ec15bf30d858a0d Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Tue, 10 Aug 2010 21:40:24 +0200
Subject: Use more consitent naming for package pool
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There are no longer architecture-specific subdirs and the structure was switch to this:

ftp
└── pool
    ├── community
    └── packages

packages contains all packages from core, extra and testing; this naming is in sync with the svn repo naming:
svn-packages and svn-community
---
 db-move | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'db-move')

diff --git a/db-move b/db-move
index bbe7ff7..d18a4fa 100755
--- a/db-move
+++ b/db-move
@@ -53,13 +53,13 @@ if [ -d "$packagebase/repos/$svnrepo_from" ]; then
 
 			# copy package to pool if needed
 			# TODO: can be removed once every package has been moved to the package pool
-			if [ ! -f $FTP_BASE/$(get_pkgpool_for_host)/${arch}/$pkgfile ]; then
-				cp $pkgpath $FTP_BASE/$(get_pkgpool_for_host)/${arch}/
+			if [ ! -f $FTP_BASE/$(get_pkgpool_for_host)/$pkgfile ]; then
+				cp $pkgpath $FTP_BASE/$(get_pkgpool_for_host)
 			fi
-			ln -s "../../../$(get_pkgpool_for_host)/${arch}/${pkgfile}" $ftppath_to/${tarch}/
+			ln -s "../../../$(get_pkgpool_for_host)/${pkgfile}" $ftppath_to/${tarch}/
 		done
 
-		pkgfiles="${pkgfiles} $FTP_BASE/$(get_pkgpool_for_host)/${arch}/${pkgfile}"
+		pkgfiles="${pkgfiles} $FTP_BASE/$(get_pkgpool_for_host)/${pkgfile}"
 	done
 
 	for tarch in ${tarches[@]}; do
-- 
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-move | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'db-move')

diff --git a/db-move b/db-move
index d18a4fa..41b360d 100755
--- a/db-move
+++ b/db-move
@@ -23,6 +23,11 @@ ftppath_to="$FTP_BASE/$repoto/os/"
 svnrepo_from="$repofrom-$arch"
 svnrepo_to="$repoto-$arch"
 
+if ! check_repo_permission $repoto || ! check_repo_permission $repofrom; then
+	echo "Error: You don't have permission to move packages from ${repofrom} to ${repoto}"
+	exit 1
+fi
+
 repo_lock $repoto $arch || exit 1
 repo_lock $repofrom $arch || exit 1
 
-- 
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-move | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'db-move')

diff --git a/db-move b/db-move
index 41b360d..207baec 100755
--- a/db-move
+++ b/db-move
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [ $# -ne 4 ]; then
-	echo "usage: $(basename $0) <pkgname|pkgbase> <repo-from> <repo-to> <arch>"
+	msg "usage: $(basename $0) <pkgname|pkgbase> <repo-from> <repo-to> <arch>"
 	exit 1
 fi
 
@@ -24,7 +24,7 @@ svnrepo_from="$repofrom-$arch"
 svnrepo_to="$repoto-$arch"
 
 if ! check_repo_permission $repoto || ! check_repo_permission $repofrom; then
-	echo "Error: You don't have permission to move packages from ${repofrom} to ${repoto}"
+	error "You don't have permission to move packages from ${repofrom} to ${repoto}"
 	exit 1
 fi
 
@@ -41,7 +41,7 @@ if [ -d "$packagebase/repos/$svnrepo_from" ]; then
 	pkgver=$(. "$packagebase/repos/$svnrepo_from/PKGBUILD"; echo ${pkgver})
 	pkgrel=$(. "$packagebase/repos/$svnrepo_from/PKGBUILD"; echo ${pkgrel})
 
-	echo -n "Moving $packagebase from $repofrom to $repoto..."
+	msg "Moving $packagebase from $repofrom to $repoto..."
 	if [ -d "$packagebase/repos/$svnrepo_to" ]; then
 		/usr/bin/svn rm --force -q "$packagebase/repos/$svnrepo_to"
 		/usr/bin/svn commit -q -m "$(basename $0): $packagebase removed by $(id -un) for move to $repoto"
@@ -71,10 +71,8 @@ if [ -d "$packagebase/repos/$svnrepo_from" ]; then
 		/usr/bin/repo-add -q "$ftppath_to/${tarch}/$repoto$DBEXT" ${pkgfiles} >/dev/null || die "Error in repo-add $pkgfiles"
 		/usr/bin/repo-remove -q "$ftppath_from/${tarch}/$repofrom$DBEXT" ${pkgname[@]} >/dev/null || die "Error in repo-remove ${pkgname[@]}"
 	done
-
-	echo 'done'
 else
-	die "Error: $packagebase is not in repo $repofrom"
+	die "$packagebase is not in repo $repofrom"
 fi
 
 repo_unlock $repoto $arch || exit 1
-- 
cgit v1.2.3-2-g168b


From cfa19b31cdeb6698d69ae9a82904c09d3d65a5d7 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 14 Aug 2010 20:20:11 +0200
Subject: Don't hardcode supported architectures in db-move

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

(limited to 'db-move')

diff --git a/db-move b/db-move
index 207baec..68cfc07 100755
--- a/db-move
+++ b/db-move
@@ -13,7 +13,7 @@ repofrom="$2"
 repoto="$3"
 arch="$4"
 if [ "${arch}" == 'any' ]; then
-	tarches=('i686' 'x86_64')
+	tarches=(${ARCHES[@]})
 else
 	tarches=("${arch}")
 fi
-- 
cgit v1.2.3-2-g168b


From 55aa721771c7486c447b270325c504724622fd00 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 14 Aug 2010 22:41:16 +0200
Subject: Prepare support for multiple packages in db-move

---
 db-move | 87 ++++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 48 insertions(+), 39 deletions(-)

(limited to 'db-move')

diff --git a/db-move b/db-move
index 68cfc07..4c18167 100755
--- a/db-move
+++ b/db-move
@@ -1,17 +1,18 @@
 #!/bin/bash
 
 if [ $# -ne 4 ]; then
-	msg "usage: $(basename $0) <pkgname|pkgbase> <repo-from> <repo-to> <arch>"
+	msg "usage: $(basename $0) <repo-from> <repo-to> <arch> <pkgname|pkgbase> ..."
 	exit 1
 fi
 
 . "$(dirname $0)/db-functions"
 . "$(dirname $0)/config"
 
-packagebase="$1"
-repofrom="$2"
-repoto="$3"
-arch="$4"
+args=(${@})
+repofrom="${args[0]}"
+repoto="${args[1]}"
+arch="${args[2]}"
+# TODO: make db-move arch-independent?
 if [ "${arch}" == 'any' ]; then
 	tarches=(${ARCHES[@]})
 else
@@ -27,53 +28,61 @@ if ! check_repo_permission $repoto || ! check_repo_permission $repofrom; then
 	error "You don't have permission to move packages from ${repofrom} to ${repoto}"
 	exit 1
 fi
+# TODO: add other tests before touch the repos
 
 repo_lock $repoto $arch || exit 1
 repo_lock $repofrom $arch || exit 1
 
-cd "$WORKDIR"
+pushd "$WORKDIR" >/dev/null
 /usr/bin/svn checkout -q -N $SVNREPO checkout >/dev/null
-cd checkout
+pushd checkout >/dev/null
 
-/usr/bin/svn up -q $packagebase
-if [ -d "$packagebase/repos/$svnrepo_from" ]; then
-	pkgname=($(. "$packagebase/repos/$svnrepo_from/PKGBUILD"; echo ${pkgname[@]}))
-	pkgver=$(. "$packagebase/repos/$svnrepo_from/PKGBUILD"; echo ${pkgver})
-	pkgrel=$(. "$packagebase/repos/$svnrepo_from/PKGBUILD"; echo ${pkgrel})
+add_pkgs=()
+remove_pkgs=()
+for pkgbase in ${args[@]:3}; do
+	# TODO: optimize
+	/usr/bin/svn up -q $pkgbase
+	if [ -d "$pkgbase/repos/$svnrepo_from" ]; then
+		pkgname=($(. "$pkgbase/repos/$svnrepo_from/PKGBUILD"; echo ${pkgname[@]}))
+		pkgver=$(. "$pkgbase/repos/$svnrepo_from/PKGBUILD"; echo ${pkgver})
+		pkgrel=$(. "$pkgbase/repos/$svnrepo_from/PKGBUILD"; echo ${pkgrel})
 
-	msg "Moving $packagebase from $repofrom to $repoto..."
-	if [ -d "$packagebase/repos/$svnrepo_to" ]; then
-		/usr/bin/svn rm --force -q "$packagebase/repos/$svnrepo_to"
-		/usr/bin/svn commit -q -m "$(basename $0): $packagebase removed by $(id -un) for move to $repoto"
-	fi
+		msg "Moving $pkgbase from $repofrom to $repoto..."
+		if [ -d "$pkgbase/repos/$svnrepo_to" ]; then
+			/usr/bin/svn rm --force -q "$pkgbase/repos/$svnrepo_to"
+			/usr/bin/svn commit -q -m "$(basename $0): $pkgbase removed by $(id -un) for move to $repoto"
+		fi
 
-	/usr/bin/svn mv -q -r HEAD "$packagebase/repos/$svnrepo_from" "$packagebase/repos/$svnrepo_to"
-	/usr/bin/svn commit -q -m "$(basename $0): moved $packagebase from [$repofrom] to [$repoto] ($arch)"
+		/usr/bin/svn mv -q -r HEAD "$pkgbase/repos/$svnrepo_from" "$pkgbase/repos/$svnrepo_to"
+		/usr/bin/svn commit -q -m "$(basename $0): moved $pkgbase from [$repofrom] to [$repoto] ($arch)"
 
-	pkgfiles=''
-	for i in ${pkgname[@]}; do
-		for tarch in ${tarches[@]}; do
-			pkgpath=$(getpkgfile "$ftppath_from/${tarch}/"$i-$pkgver-$pkgrel-$arch$PKGEXT)
-			pkgfile=$(basename "${pkgpath}")
+		for i in ${pkgname[@]}; do
+			for tarch in ${tarches[@]}; do
+				pkgpath=$(getpkgfile "$ftppath_from/${tarch}/"$i-$pkgver-$pkgrel-$arch$PKGEXT)
+				pkgfile=$(basename "${pkgpath}")
 
-			# copy package to pool if needed
-			# TODO: can be removed once every package has been moved to the package pool
-			if [ ! -f $FTP_BASE/$(get_pkgpool_for_host)/$pkgfile ]; then
-				cp $pkgpath $FTP_BASE/$(get_pkgpool_for_host)
-			fi
-			ln -s "../../../$(get_pkgpool_for_host)/${pkgfile}" $ftppath_to/${tarch}/
+				# copy package to pool if needed
+				# TODO: can be removed once every package has been moved to the package pool
+				if [ ! -f $FTP_BASE/$(get_pkgpool_for_host)/$pkgfile ]; then
+					cp $pkgpath $FTP_BASE/$(get_pkgpool_for_host)
+				fi
+				ln -s "../../../$(get_pkgpool_for_host)/${pkgfile}" $ftppath_to/${tarch}/
+			done
+			add_pkgs[${#add_pkgs[*]}]="$FTP_BASE/$(get_pkgpool_for_host)/${pkgfile}"
+			remove_pkgs[${#remove_pkgs[*]}]=${i}
 		done
+	else
+		die "$pkgbase is not in repo $repofrom"
+	fi
+done
 
-		pkgfiles="${pkgfiles} $FTP_BASE/$(get_pkgpool_for_host)/${pkgfile}"
-	done
+for tarch in ${tarches[@]}; do
+	/usr/bin/repo-add -q "$ftppath_to/${tarch}/$repoto$DBEXT" ${add_pkgs[@]} >/dev/null || die "Error in repo-add"
+	/usr/bin/repo-remove -q "$ftppath_from/${tarch}/$repofrom$DBEXT" ${remove_pkgs[@]} >/dev/null || die "Error in repo-remove"
+done
 
-	for tarch in ${tarches[@]}; do
-		/usr/bin/repo-add -q "$ftppath_to/${tarch}/$repoto$DBEXT" ${pkgfiles} >/dev/null || die "Error in repo-add $pkgfiles"
-		/usr/bin/repo-remove -q "$ftppath_from/${tarch}/$repofrom$DBEXT" ${pkgname[@]} >/dev/null || die "Error in repo-remove ${pkgname[@]}"
-	done
-else
-	die "$packagebase is not in repo $repofrom"
-fi
+popd >/dev/null
+popd >/dev/null
 
 repo_unlock $repoto $arch || exit 1
 repo_unlock $repofrom $arch || exit 1
-- 
cgit v1.2.3-2-g168b


From 79db58732efbab54911ccbbb8cd876da29ea48c8 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 15 Aug 2010 18:21:33 +0200
Subject: Move packages of all arches within one transaction

db-move does no longer need a specific architecture. It will move all architecures of a given package
at once.

testing2x has been rewritten to respect these changes and testing2x64 is no longer needed.
---
 db-move | 143 ++++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 76 insertions(+), 67 deletions(-)

(limited to 'db-move')

diff --git a/db-move b/db-move
index 4c18167..ae98958 100755
--- a/db-move
+++ b/db-move
@@ -1,88 +1,97 @@
 #!/bin/bash
 
-if [ $# -ne 4 ]; then
-	msg "usage: $(basename $0) <repo-from> <repo-to> <arch> <pkgname|pkgbase> ..."
-	exit 1
-fi
-
 . "$(dirname $0)/db-functions"
 . "$(dirname $0)/config"
 
-args=(${@})
-repofrom="${args[0]}"
-repoto="${args[1]}"
-arch="${args[2]}"
-# TODO: make db-move arch-independent?
-if [ "${arch}" == 'any' ]; then
-	tarches=(${ARCHES[@]})
-else
-	tarches=("${arch}")
+if [ $# -lt 3 ]; then
+	msg "usage: $(basename $0) <repo-from> <repo-to> <pkgname|pkgbase> ..."
+	exit 1
 fi
 
-ftppath_from="$FTP_BASE/$repofrom/os/"
-ftppath_to="$FTP_BASE/$repoto/os/"
-svnrepo_from="$repofrom-$arch"
-svnrepo_to="$repoto-$arch"
+args=(${@})
+repo_from="${args[0]}"
+repo_to="${args[1]}"
+ftppath_from="${FTP_BASE}/${repo_from}/os/"
+ftppath_to="${FTP_BASE}/${repo_to}/os/"
 
-if ! check_repo_permission $repoto || ! check_repo_permission $repofrom; then
-	error "You don't have permission to move packages from ${repofrom} to ${repoto}"
-	exit 1
+if ! check_repo_permission $repo_to || ! check_repo_permission $repo_from; then
+	die "You don't have permission to move packages from ${repo_from} to ${repo_to}"
 fi
-# TODO: add other tests before touch the repos
 
-repo_lock $repoto $arch || exit 1
-repo_lock $repofrom $arch || exit 1
+/usr/bin/svn checkout -q -N "${SVNREPO}" "${WORKDIR}/svn" >/dev/null
+for pkgbase in ${args[@]:2}; do
+	/usr/bin/svn up -q "${WORKDIR}/svn/${pkgbase}" >/dev/null
+	for pkgarch in ${ARCHES[@]} 'any'; do
+		svnrepo_from="${WORKDIR}/svn/${pkgbase}/repos/${repo_from}-${pkgarch}"
+		if [ -r "${svnrepo_from}/PKGBUILD" ]; then
+			continue 2
+		fi
+	done
+	die "${pkgbase} not found in ${repo_from}"
+done
+
+# TODO: this might lock too much (architectures)
+for pkgarch in ${ARCHES[@]}; do
+	repo_lock ${repo_to} ${pkgarch} || exit 1
+	repo_lock ${repo_from} ${pkgarch} || exit 1
+done
 
-pushd "$WORKDIR" >/dev/null
-/usr/bin/svn checkout -q -N $SVNREPO checkout >/dev/null
-pushd checkout >/dev/null
+msg "Moving packages from [${repo_from}] to [${repo_to}]..."
 
-add_pkgs=()
-remove_pkgs=()
-for pkgbase in ${args[@]:3}; do
-	# TODO: optimize
-	/usr/bin/svn up -q $pkgbase
-	if [ -d "$pkgbase/repos/$svnrepo_from" ]; then
-		pkgname=($(. "$pkgbase/repos/$svnrepo_from/PKGBUILD"; echo ${pkgname[@]}))
-		pkgver=$(. "$pkgbase/repos/$svnrepo_from/PKGBUILD"; echo ${pkgver})
-		pkgrel=$(. "$pkgbase/repos/$svnrepo_from/PKGBUILD"; echo ${pkgrel})
+declare -A add_pkgs
+declare -A remove_pkgs
+for pkgbase in ${args[@]:2}; do
+	for pkgarch in ${ARCHES[@]} 'any'; do
+		svnrepo_from="${WORKDIR}/svn/${pkgbase}/repos/${repo_from}-${pkgarch}"
+		svnrepo_to="${WORKDIR}/svn/${pkgbase}/repos/${repo_to}-${pkgarch}"
 
-		msg "Moving $pkgbase from $repofrom to $repoto..."
-		if [ -d "$pkgbase/repos/$svnrepo_to" ]; then
-			/usr/bin/svn rm --force -q "$pkgbase/repos/$svnrepo_to"
-			/usr/bin/svn commit -q -m "$(basename $0): $pkgbase removed by $(id -un) for move to $repoto"
-		fi
+		if [ -f "${svnrepo_from}/PKGBUILD" ]; then
+			if [ "${pkgarch}" == 'any' ]; then
+				tarches=(${ARCHES[@]})
+			else
+				tarches=("${pkgarch}")
+			fi
+			msg2 "${pkgbase} ($(echo ${tarches[@]}))"
+			pkgnames=($(. "${svnrepo_from}/PKGBUILD"; echo ${pkgname[@]}))
+			pkgver=$(. "${svnrepo_from}/PKGBUILD"; echo "${pkgver}-${pkgrel}")
 
-		/usr/bin/svn mv -q -r HEAD "$pkgbase/repos/$svnrepo_from" "$pkgbase/repos/$svnrepo_to"
-		/usr/bin/svn commit -q -m "$(basename $0): moved $pkgbase from [$repofrom] to [$repoto] ($arch)"
+			if [ -d "${svnrepo_to}" ]; then
+				/usr/bin/svn rm --force -q "${svnrepo_to}"
+				/usr/bin/svn commit -q "${WORKDIR}/svn/${pkgbase}" -m "$(basename $0): ${pkgbase} removed by $(id -un) for move to [${repo_to}] (${pkgarch})"
+			fi
 
-		for i in ${pkgname[@]}; do
-			for tarch in ${tarches[@]}; do
-				pkgpath=$(getpkgfile "$ftppath_from/${tarch}/"$i-$pkgver-$pkgrel-$arch$PKGEXT)
-				pkgfile=$(basename "${pkgpath}")
+			/usr/bin/svn mv -q -r HEAD "${svnrepo_from}" "${svnrepo_to}"
+			/usr/bin/svn commit -q "${WORKDIR}/svn/${pkgbase}" -m "$(basename $0): moved ${pkgbase} from [${repo_from}] to [${repo_to}] (${pkgarch})"
 
-				# copy package to pool if needed
-				# TODO: can be removed once every package has been moved to the package pool
-				if [ ! -f $FTP_BASE/$(get_pkgpool_for_host)/$pkgfile ]; then
-					cp $pkgpath $FTP_BASE/$(get_pkgpool_for_host)
-				fi
-				ln -s "../../../$(get_pkgpool_for_host)/${pkgfile}" $ftppath_to/${tarch}/
+			for pkgname in ${pkgnames[@]}; do
+				for tarch in ${tarches[@]}; do
+					pkgpath=$(getpkgfile "${ftppath_from}/${tarch}/"${pkgname}-${pkgver}-${pkgarch}${PKGEXT})
+					pkgfile=$(basename "${pkgpath}")
+
+					# copy package to pool if needed
+					# TODO: can be removed once every package has been moved to the package pool
+					if [ ! -f ${FTP_BASE}/$(get_pkgpool_for_host)/${pkgfile} ]; then
+						cp ${pkgpath} ${FTP_BASE}/$(get_pkgpool_for_host)
+					fi
+					ln -s "../../../$(get_pkgpool_for_host)/${pkgfile}" ${ftppath_to}/${tarch}/
+					add_pkgs[${tarch}]+="${FTP_BASE}/$(get_pkgpool_for_host)/${pkgfile} "
+					remove_pkgs[${tarch}]+="${pkgname} "
+				done
 			done
-			add_pkgs[${#add_pkgs[*]}]="$FTP_BASE/$(get_pkgpool_for_host)/${pkgfile}"
-			remove_pkgs[${#remove_pkgs[*]}]=${i}
-		done
-	else
-		die "$pkgbase is not in repo $repofrom"
-	fi
+		fi
+	done
 done
 
-for tarch in ${tarches[@]}; do
-	/usr/bin/repo-add -q "$ftppath_to/${tarch}/$repoto$DBEXT" ${add_pkgs[@]} >/dev/null || die "Error in repo-add"
-	/usr/bin/repo-remove -q "$ftppath_from/${tarch}/$repofrom$DBEXT" ${remove_pkgs[@]} >/dev/null || die "Error in repo-remove"
+for tarch in ${ARCHES[@]}; do
+	if [ -n "${add_pkgs[${tarch}]}" ]; then
+		/usr/bin/repo-add -q "${ftppath_to}/${tarch}/${repo_to}${DBEXT}" ${add_pkgs[${tarch}]} >/dev/null \
+			|| die "Error in repo-add ${add_pkgs[${tarch}]}"
+		/usr/bin/repo-remove -q "${ftppath_from}/${tarch}/${repo_from}${DBEXT}" ${remove_pkgs[${tarch}]} >/dev/null \
+			|| die "Error in repo-remove ${remove_pkgs[${tarch}]}"
+	fi
 done
 
-popd >/dev/null
-popd >/dev/null
-
-repo_unlock $repoto $arch || exit 1
-repo_unlock $repofrom $arch || exit 1
+for pkgarch in ${ARCHES[@]}; do
+	repo_unlock ${repo_from} ${pkgarch}
+	repo_unlock ${repo_to} ${pkgarch}
+done
-- 
cgit v1.2.3-2-g168b


From b5fb2927cde513dc0fd82e4fd4dfe3836cf35728 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 15 Aug 2010 20:55:26 +0200
Subject: Lock repos before checking

---
 db-move | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

(limited to 'db-move')

diff --git a/db-move b/db-move
index ae98958..a274cd3 100755
--- a/db-move
+++ b/db-move
@@ -18,24 +18,37 @@ if ! check_repo_permission $repo_to || ! check_repo_permission $repo_from; then
 	die "You don't have permission to move packages from ${repo_from} to ${repo_to}"
 fi
 
+# TODO: this might lock too much (architectures)
+for pkgarch in ${ARCHES[@]}; do
+	repo_lock ${repo_to} ${pkgarch} || exit 1
+	repo_lock ${repo_from} ${pkgarch} || exit 1
+done
+
+# check if packages to be moved exist in svn and ftp dir
 /usr/bin/svn checkout -q -N "${SVNREPO}" "${WORKDIR}/svn" >/dev/null
 for pkgbase in ${args[@]:2}; do
 	/usr/bin/svn up -q "${WORKDIR}/svn/${pkgbase}" >/dev/null
 	for pkgarch in ${ARCHES[@]} 'any'; do
 		svnrepo_from="${WORKDIR}/svn/${pkgbase}/repos/${repo_from}-${pkgarch}"
 		if [ -r "${svnrepo_from}/PKGBUILD" ]; then
+			pkgnames=($(. "${svnrepo_from}/PKGBUILD"; echo ${pkgname[@]}))
+			pkgver=$(. "${svnrepo_from}/PKGBUILD"; echo "${pkgver}-${pkgrel}")
+			if [ "${pkgarch}" == 'any' ]; then
+				tarches=(${ARCHES[@]})
+			else
+				tarches=("${pkgarch}")
+			fi
+			for pkgname in ${pkgnames[@]}; do
+				for tarch in ${tarches[@]}; do
+					getpkgfile "${ftppath_from}/${tarch}/"${pkgname}-${pkgver}-${pkgarch}${PKGEXT} >/dev/null
+				done
+			done
 			continue 2
 		fi
 	done
 	die "${pkgbase} not found in ${repo_from}"
 done
 
-# TODO: this might lock too much (architectures)
-for pkgarch in ${ARCHES[@]}; do
-	repo_lock ${repo_to} ${pkgarch} || exit 1
-	repo_lock ${repo_from} ${pkgarch} || exit 1
-done
-
 msg "Moving packages from [${repo_from}] to [${repo_to}]..."
 
 declare -A add_pkgs
-- 
cgit v1.2.3-2-g168b


From 17c9dab4b420ca55fd4fb3f277805af148159a4d Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Tue, 17 Aug 2010 20:32:47 +0200
Subject: Add additional checks when reading PKGBUILDs

If reading from a PKGBUILD fails stop immediatly. Also put out more usefull error messages.
---
 db-move | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'db-move')

diff --git a/db-move b/db-move
index a274cd3..5ffb8bc 100755
--- a/db-move
+++ b/db-move
@@ -32,12 +32,21 @@ for pkgbase in ${args[@]:2}; do
 		svnrepo_from="${WORKDIR}/svn/${pkgbase}/repos/${repo_from}-${pkgarch}"
 		if [ -r "${svnrepo_from}/PKGBUILD" ]; then
 			pkgnames=($(. "${svnrepo_from}/PKGBUILD"; echo ${pkgname[@]}))
+			if [ ${#pkgnames[@]} -lt 1 ]; then
+				die "Could not read pkgname"
+			fi
+
 			pkgver=$(. "${svnrepo_from}/PKGBUILD"; echo "${pkgver}-${pkgrel}")
+			if [ -z "${pkgver}" ]; then
+				die "Could not read pkgver"
+			fi
+
 			if [ "${pkgarch}" == 'any' ]; then
 				tarches=(${ARCHES[@]})
 			else
 				tarches=("${pkgarch}")
 			fi
+
 			for pkgname in ${pkgnames[@]}; do
 				for tarch in ${tarches[@]}; do
 					getpkgfile "${ftppath_from}/${tarch}/"${pkgname}-${pkgver}-${pkgarch}${PKGEXT} >/dev/null
@@ -98,9 +107,9 @@ done
 for tarch in ${ARCHES[@]}; do
 	if [ -n "${add_pkgs[${tarch}]}" ]; then
 		/usr/bin/repo-add -q "${ftppath_to}/${tarch}/${repo_to}${DBEXT}" ${add_pkgs[${tarch}]} >/dev/null \
-			|| die "Error in repo-add ${add_pkgs[${tarch}]}"
+			|| error "repo-add ${tarch}/${repo_to}${DBEXT} ${add_pkgs[${tarch}]}"
 		/usr/bin/repo-remove -q "${ftppath_from}/${tarch}/${repo_from}${DBEXT}" ${remove_pkgs[${tarch}]} >/dev/null \
-			|| die "Error in repo-remove ${remove_pkgs[${tarch}]}"
+			|| error "repo-remove ${tarch}/${repo_from}${DBEXT} ${remove_pkgs[${tarch}]}"
 	fi
 done
 
-- 
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-move | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'db-move')

diff --git a/db-move b/db-move
index 5ffb8bc..fe9d2c9 100755
--- a/db-move
+++ b/db-move
@@ -108,8 +108,11 @@ for tarch in ${ARCHES[@]}; do
 	if [ -n "${add_pkgs[${tarch}]}" ]; then
 		/usr/bin/repo-add -q "${ftppath_to}/${tarch}/${repo_to}${DBEXT}" ${add_pkgs[${tarch}]} >/dev/null \
 			|| error "repo-add ${tarch}/${repo_to}${DBEXT} ${add_pkgs[${tarch}]}"
+		set_repo_permission "${repo_to}" "${tarch}"
+
 		/usr/bin/repo-remove -q "${ftppath_from}/${tarch}/${repo_from}${DBEXT}" ${remove_pkgs[${tarch}]} >/dev/null \
 			|| error "repo-remove ${tarch}/${repo_from}${DBEXT} ${remove_pkgs[${tarch}]}"
+		set_repo_permission "${repo_from}" "${tarch}"
 	fi
 done
 
-- 
cgit v1.2.3-2-g168b


From f121126f8166fb6dc261ea82f2890ba6693d047e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 11 Sep 2010 22:52:23 +0200
Subject: Use local config instead of guessing by hostname

Using the hostname to decide which repos to use is not releiable and hard to test.
Instead use config.local to configure these.

config files for sigurd and gerolde were added which can be copied or symlinked to config.local
on the specific host.
---
 db-move | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'db-move')

diff --git a/db-move b/db-move
index fe9d2c9..cdc261c 100755
--- a/db-move
+++ b/db-move
@@ -92,11 +92,11 @@ for pkgbase in ${args[@]:2}; do
 
 					# copy package to pool if needed
 					# TODO: can be removed once every package has been moved to the package pool
-					if [ ! -f ${FTP_BASE}/$(get_pkgpool_for_host)/${pkgfile} ]; then
-						cp ${pkgpath} ${FTP_BASE}/$(get_pkgpool_for_host)
+					if [ ! -f ${FTP_BASE}/${PKGPOOL}/${pkgfile} ]; then
+						cp ${pkgpath} ${FTP_BASE}/${PKGPOOL}
 					fi
-					ln -s "../../../$(get_pkgpool_for_host)/${pkgfile}" ${ftppath_to}/${tarch}/
-					add_pkgs[${tarch}]+="${FTP_BASE}/$(get_pkgpool_for_host)/${pkgfile} "
+					ln -s "../../../${PKGPOOL}/${pkgfile}" ${ftppath_to}/${tarch}/
+					add_pkgs[${tarch}]+="${FTP_BASE}/${PKGPOOL}/${pkgfile} "
 					remove_pkgs[${tarch}]+="${pkgname} "
 				done
 			done
-- 
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-move | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'db-move')

diff --git a/db-move b/db-move
index cdc261c..ae21781 100755
--- a/db-move
+++ b/db-move
@@ -106,13 +106,8 @@ done
 
 for tarch in ${ARCHES[@]}; do
 	if [ -n "${add_pkgs[${tarch}]}" ]; then
-		/usr/bin/repo-add -q "${ftppath_to}/${tarch}/${repo_to}${DBEXT}" ${add_pkgs[${tarch}]} >/dev/null \
-			|| error "repo-add ${tarch}/${repo_to}${DBEXT} ${add_pkgs[${tarch}]}"
-		set_repo_permission "${repo_to}" "${tarch}"
-
-		/usr/bin/repo-remove -q "${ftppath_from}/${tarch}/${repo_from}${DBEXT}" ${remove_pkgs[${tarch}]} >/dev/null \
-			|| error "repo-remove ${tarch}/${repo_from}${DBEXT} ${remove_pkgs[${tarch}]}"
-		set_repo_permission "${repo_from}" "${tarch}"
+		arch_repo_add "${repo_to}" "${tarch}" ${add_pkgs[${tarch}]}
+		arch_repo_remove "${repo_from}" "${tarch}" ${remove_pkgs[${tarch}]}
 	fi
 done
 
-- 
cgit v1.2.3-2-g168b