From 954b699c84cd0b6211bf4ffb83bcd8affd7d8875 Mon Sep 17 00:00:00 2001 From: Francois Charette Date: Tue, 15 Sep 2009 09:20:14 +0200 Subject: Remove pkg from $stagedir if already in FTP repo Signed-off-by: Aaron Griffin --- db-update | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'db-update') diff --git a/db-update b/db-update index aa1cb95..c68cf84 100755 --- a/db-update +++ b/db-update @@ -74,6 +74,29 @@ die() { trap ctrl_c 2 trap cleanup 0 +# Remove any package from $stagedir that is already in the FTP repository +for f in $stagedir/*-any$PKGEXT; do + bf=$(basename $f) + ftppath_any="$FTP_BASE/$reponame/os/any" + if [[ -f $ftppath_any/$bf ]]; then + echo " WARNING: Package file $bf already exists in FTP repo" + echo " Removing from $stagedir" + /bin/rm $f + fi +done + +for current_arch in ${ARCHES[@]}; do + ftppath="$FTP_BASE/$reponame/os/$current_arch" + for f in $stagedir/*-$current_arch$PKGEXT; do + bf=$(basename $f) + if [[ -f $ftppath/$bf ]]; then + echo " WARNING: Package file $bf already exists in FTP repo" + echo " Removing from $stagedir" + /bin/rm $f + fi + done +done + # Process architecture-independent packages first. if [ -d "$stagedir" ]; then ANYPKGS="$(/bin/ls $stagedir/*-any$PKGEXT 2>/dev/null)" -- cgit v1.2.3-24-g4f1b