From 953d9d8ea616a9505c9e13813241dee455a580dc Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaronmgriffin@gmail.com>
Date: Fri, 18 Sep 2009 10:33:11 -0700
Subject: Collapse duplicate loops for staging removal

Add 'any' to the items looped over in the ${ARCHES[@]} loop

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

(limited to 'db-update')

diff --git a/db-update b/db-update
index c68cf84..17d3b71 100755
--- a/db-update
+++ b/db-update
@@ -75,17 +75,7 @@ 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
+for current_arch in ${ARCHES[@]} any; do
 	ftppath="$FTP_BASE/$reponame/os/$current_arch"
 	for f in $stagedir/*-$current_arch$PKGEXT; do
 		bf=$(basename $f)
-- 
cgit v1.2.3-24-g4f1b