From d568b8aeb0be95d6a1da7da0434de23e6b2260e2 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Wed, 23 Mar 2011 19:50:56 +0100
Subject: Add support for packages which use the epoch variable

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

(limited to 'db-move')

diff --git a/db-move b/db-move
index ae21781..ced90a3 100755
--- a/db-move
+++ b/db-move
@@ -36,7 +36,7 @@ for pkgbase in ${args[@]:2}; do
 				die "Could not read pkgname"
 			fi
 
-			pkgver=$(. "${svnrepo_from}/PKGBUILD"; echo "${pkgver}-${pkgrel}")
+			pkgver=$(. "${svnrepo_from}/PKGBUILD"; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel}))
 			if [ -z "${pkgver}" ]; then
 				die "Could not read pkgver"
 			fi
@@ -75,7 +75,7 @@ for pkgbase in ${args[@]:2}; do
 			fi
 			msg2 "${pkgbase} ($(echo ${tarches[@]}))"
 			pkgnames=($(. "${svnrepo_from}/PKGBUILD"; echo ${pkgname[@]}))
-			pkgver=$(. "${svnrepo_from}/PKGBUILD"; echo "${pkgver}-${pkgrel}")
+			pkgver=$(. "${svnrepo_from}/PKGBUILD"; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel}))
 
 			if [ -d "${svnrepo_to}" ]; then
 				/usr/bin/svn rm --force -q "${svnrepo_to}"
-- 
cgit v1.2.3-54-g00ecf


From a7b293ad4d819fa77592818af27f7c2a3b9b2ca4 Mon Sep 17 00:00:00 2001
From: Rémy Oudompheng <remyoudompheng@gmail.com>
Date: Fri, 1 Apr 2011 00:54:57 +0200
Subject: Add signature files to update/move/remove targets
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signature files are optional and the previous behaviour
is unchanged when signatures files do not exist.

Signed-off-by: Rémy Oudompheng <remy@archlinux.org>
Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
---
 cron-jobs/ftpdir-cleanup | 10 ++++++++--
 db-move                  |  3 +++
 db-update                |  7 +++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

(limited to 'db-move')

diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index 09e8a49..bb1661a 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -10,9 +10,12 @@ clean_pkg() {
 	if ! ${CLEANUP_DRYRUN}; then
 		for pkg in "$@"; do
 			if [ -h "$pkg" ]; then
-				rm -f "$pkg"
+				rm -f "$pkg" "$pkg.sig"
 			else
 				mv -f "$pkg" "$CLEANUP_DESTDIR"
+				if [ -e "$pkg.sig" ]; then
+					mv -f "$pkg.sig" "$CLEANUP_DESTDIR"
+				fi
 				touch "${CLEANUP_DESTDIR}/$(basename ${pkg})"
 			fi
 		done
@@ -100,7 +103,10 @@ if [ ${#old_pkgs[@]} -ge 1 ]; then
 	msg "Removing old packages from the cleanup directory..."
 	for old_pkg in ${old_pkgs[@]}; do
 		msg2 "${old_pkg}"
-		${CLEANUP_DRYRUN} || rm -f "${CLEANUP_DESTDIR}/${old_pkg}"
+		if ! ${CLEANUP_DRYRUN}; then
+			rm -f "${CLEANUP_DESTDIR}/${old_pkg}"
+			rm -f "${CLEANUP_DESTDIR}/${old_pkg}.sig"
+		fi
 	done
 fi
 
diff --git a/db-move b/db-move
index ced90a3..ff1b0e2 100755
--- a/db-move
+++ b/db-move
@@ -96,6 +96,9 @@ for pkgbase in ${args[@]:2}; do
 						cp ${pkgpath} ${FTP_BASE}/${PKGPOOL}
 					fi
 					ln -s "../../../${PKGPOOL}/${pkgfile}" ${ftppath_to}/${tarch}/
+					if [ -f ${FTP_BASE}/${PKGPOOL}/${pkgfile}.sig ]; then
+						ln -s "../../../${PKGPOOL}/${pkgfile}.sig" ${ftppath_to}/${tarch}/
+					fi
 					add_pkgs[${tarch}]+="${FTP_BASE}/${PKGPOOL}/${pkgfile} "
 					remove_pkgs[${tarch}]+="${pkgname} "
 				done
diff --git a/db-update b/db-update
index 5bdce5e..4b9c78f 100755
--- a/db-update
+++ b/db-update
@@ -64,6 +64,13 @@ for repo in ${repos[@]}; do
 				mv "${pkg}" "$FTP_BASE/${PKGPOOL}"
 			fi
 			ln -s "../../../${PKGPOOL}/${pkgfile}" "$FTP_BASE/$repo/os/${pkgarch}"
+			# also move signatures
+			if [ -f "${pkg}.sig" ]; then
+				mv "${pkg}.sig" "$FTP_BASE/${PKGPOOL}"
+			fi
+			if [ -f "$FTP_BASE/${PKGPOOL}/${pkgfile}.sig" ]; then
+				ln -s "../../../${PKGPOOL}/${pkgfile}.sig" "$FTP_BASE/$repo/os/${pkgarch}"
+			fi
 			add_pkgs[${#add_pkgs[*]}]=${pkgfile}
 		done
 		if [ ${#add_pkgs[@]} -ge 1 ]; then
-- 
cgit v1.2.3-54-g00ecf