Use common names for repos

13 files changed, 7 insertions, 107 deletions

diff --git a/db-functions b/db-functions
index 102f2c8..1f54dd9 100644
--- a/db-functions
+++ b/db-functions
@@ -103,7 +103,7 @@ cleanup() {
 		repo=${l%.*}
 		arch=${l#*.}
 		if [ -d "$TMPDIR/.repolock.$repo.$arch" ]; then
-			msg "Removing left over lock from $repo/$arch"
+			msg "Removing left over lock from [${repo}] (${arch})"
 			repo_unlock $repo $arch
 		fi
 	done
@@ -151,7 +151,7 @@ repo_lock () {
 	while [ $_count -le $_trial ] || $_lockblock ; do
 		if ! mkdir "$LOCKDIR" >/dev/null 2>&1 ; then
 			_owner="$(/usr/bin/stat -c %U $LOCKDIR)"
-			warning "Repo $1-$2 is already locked by $_owner. " \
+			warning "Repo [${1}] (${2}) is already locked by $_owner. " \
 			        "Retrying in $LOCK_DELAY seconds..."
 		else
 			LOCKS[${#LOCKS[*]}]="$1.$2"
@@ -162,14 +162,14 @@ repo_lock () {
 		let _count=$_count+1
 	done
 
-	error "Repo $1-$2 is already locked by $_owner. Giving up!"
+	error "Repo [${1}] (${2}) is already locked by $_owner. Giving up!"
 	return 1
 }
 
 repo_unlock () { #repo_unlock <repo-name> <arch>
 	local LOCKDIR="$TMPDIR/.repolock.$1.$2"
 	if [ ! -d "$LOCKDIR" ]; then
-		warning "Repo lock $1-$2 was not locked!"
+		warning "Repo lock [${1}] (${2}) was not locked!"
 		restore_umask
 		return 1
 	else
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
diff --git a/db-update b/db-update
index 43c44f7..73897f3 100755
--- a/db-update
+++ b/db-update
@@ -49,14 +49,14 @@ for repo in ${repos[@]}; do
 done
 
 for repo in ${repos[@]}; do
+	msg "Updating [${repo}]..."
 	any_pkgs=($(getpkgfiles "${STAGING}/${repo}/"*-any${PKGEXT} 2>/dev/null))
 	for pkgarch in ${ARCHES[@]}; do
-		msg "Updating [${repo}] (${pkgarch})..."
 		add_pkgs=()
 		arch_pkgs=($(getpkgfiles "${STAGING}/${repo}/"*-${pkgarch}${PKGEXT} 2>/dev/null))
 		for pkg in ${arch_pkgs[@]} ${any_pkgs[@]}; do
 			pkgfile="$(basename ${pkg})"
-			msg2 "${pkgfile}"
+			msg2 "${pkgfile} (${pkgarch})"
 			# any packages might have been moved by the previous run
 			if [ -f "${pkg}" ]; then
 				mv "${pkg}" "$FTP_BASE/$(get_pkgpool_for_host)"
diff --git a/testing2community b/testing2community
deleted file mode 100755
index 557b39d..0000000
--- a/testing2community
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-if [ $# -le 0 ]; then
-    echo "usage: $(basename 0) <packagename> [<packagename> [<packagename ...]]"
-    exit 0
-fi
-
-for pkg in $@; do
-    echo "==> Moving package '$pkg'"
-    $(dirname $0)/db-move "$pkg" "community-testing" "community" "i686"
-done
diff --git a/testing2community-any b/testing2community-any
deleted file mode 100755
index e63a7ec..0000000
--- a/testing2community-any
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-if [ $# -le 0 ]; then
-    echo "usage: $(basename 0) <packagename> [<packagename> [<packagename ...]]"
-    exit 0
-fi
-
-for pkg in $@; do
-    echo "==> Moving package '$pkg'"
-    $(dirname $0)/db-move "$pkg" "community-testing" "community" "any"
-done
diff --git a/testing2community64 b/testing2community64
deleted file mode 100755
index 3f88a4d..0000000
--- a/testing2community64
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-if [ $# -le 0 ]; then
-    echo "usage: $(basename 0) <packagename> [<packagename> [<packagename ...]]"
-    exit 0
-fi
-
-for pkg in $@; do
-    echo "==> Moving package '$pkg'"
-    $(dirname $0)/db-move "$pkg" "community-testing" "community" "x86_64"
-done
diff --git a/testing2core b/testing2core
deleted file mode 100755
index 3a7acbf..0000000
--- a/testing2core
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-if [ $# -le 0 ]; then
-    echo "usage: $(basename 0) <packagename> [<packagename> [<packagename ...]]"
-    exit 0
-fi
-
-for pkg in $@; do
-    echo "==> Moving package '$pkg'"
-    $(dirname $0)/db-move "$pkg" "testing" "core" "i686"
-done
diff --git a/testing2core-any b/testing2core-any
deleted file mode 100755
index a0993e8..0000000
--- a/testing2core-any
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-if [ $# -le 0 ]; then
-    echo "usage: $(basename 0) <packagename> [<packagename> [<packagename ...]]"
-    exit 0
-fi
-
-for pkg in $@; do
-    echo "==> Moving package '$pkg'"
-    $(dirname $0)/db-move "$pkg" "testing" "core" "any"
-done
diff --git a/testing2core64 b/testing2core64
deleted file mode 100755
index 4d30036..0000000
--- a/testing2core64
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-if [ $# -le 0 ]; then
-    echo "usage: $(basename 0) <packagename> [<packagename> [<packagename ...]]"
-    exit 0
-fi
-
-for pkg in $@; do
-    echo "==> Moving package '$pkg'"
-    $(dirname $0)/db-move "$pkg" "testing" "core" "x86_64"
-done
diff --git a/testing2extra b/testing2extra
deleted file mode 100755
index 3be108e..0000000
--- a/testing2extra
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-if [ $# -le 0 ]; then
-    echo "usage: $(basename 0) <packagename> [<packagename> [<packagename ...]]"
-    exit 0
-fi
-
-for pkg in $@; do
-    echo "==> Moving package '$pkg'"
-    $(dirname $0)/db-move "$pkg" "testing" "extra" "i686"
-done
diff --git a/testing2extra-any b/testing2extra-any
deleted file mode 100755
index 46ab2f0..0000000
--- a/testing2extra-any
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-if [ $# -le 0 ]; then
-    echo "usage: $(basename 0) <packagename> [<packagename> [<packagename ...]]"
-    exit 0
-fi
-
-for pkg in $@; do
-    echo "==> Moving package '$pkg'"
-    $(dirname $0)/db-move "$pkg" "testing" "extra" "any"
-done
diff --git a/testing2extra64 b/testing2extra64
deleted file mode 100755
index 418876c..0000000
--- a/testing2extra64
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-if [ $# -le 0 ]; then
-    echo "usage: $(basename 0) <packagename> [<packagename> [<packagename ...]]"
-    exit 0
-fi
-
-for pkg in $@; do
-    echo "==> Moving package '$pkg'"
-    $(dirname $0)/db-move "$pkg" "testing" "extra" "x86_64"
-done
diff --git a/testing2x64 b/testing2x64
deleted file mode 120000
index ff08aa7..0000000
--- a/testing2x64
+++ /dev/null
@@ -1 +0,0 @@
-testing2x
\ No newline at end of file