From c639ae7d7a9fa5544d495e0b4d4f3b49611a7af9 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 10 Jun 2012 11:45:59 +0200
Subject: Remove support for packages in legacy $repo/os/any directories

---
 test/lib/common.inc | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'test/lib')

diff --git a/test/lib/common.inc b/test/lib/common.inc
index 6efd517..827c207 100644
--- a/test/lib/common.inc
+++ b/test/lib/common.inc
@@ -82,7 +82,7 @@ setUp() {
 
 	for r in ${PKGREPOS[@]}; do
 		mkdir -p "${TMP}/staging/${r}"
-		for a in ${ARCHES[@]} any; do
+		for a in ${ARCHES[@]}; do
 			mkdir -p "${TMP}/ftp/${r}/os/${a}"
 		done
 	done
@@ -169,18 +169,15 @@ checkAnyPackageDB() {
 			[ "$(readlink -e "${FTP_BASE}/${repo}/os/${arch}/${pkg}.sig")" == "${FTP_BASE}/${PKGPOOL}/${pkg}.sig" ] \
 				|| fail "${repo}/os/${arch}/${pkg}.sig does not link to ${PKGPOOL}/${pkg}.sig"
 		fi
+
+		for db in ${DBEXT} ${FILESEXT}; do
+			( [ -r "${FTP_BASE}/${repo}/os/${arch}/${repo}${db%.tar.*}" ] \
+				&& bsdtar -xf "${FTP_BASE}/${repo}/os/${arch}/${repo}${db%.tar.*}" -O | grep -q ${pkg}) \
+				|| fail "${pkg} not in ${repo}/os/${arch}/${repo}${db%.tar.*}"
+		done
 	done
 	[ -r "${STAGING}"/${repo}/${pkg} ] && fail "${repo}/${pkg} found in staging dir"
 	[ -r "${STAGING}"/${repo}/${pkg}.sig ] && fail "${repo}/${pkg}.sig found in staging dir"
-
-	for db in ${DBEXT} ${FILESEXT}; do
-		( [ -r "${FTP_BASE}/${repo}/os/${arch}/${repo}${db%.tar.*}" ] \
-			&& bsdtar -xf "${FTP_BASE}/${repo}/os/${arch}/${repo}${db%.tar.*}" -O | grep -q ${pkg}) \
-			|| fail "${pkg} not in ${repo}/os/${arch}/${repo}${db%.tar.*}"
-	done
-
-	[ -r "${FTP_BASE}/${repo}/os/any/${pkg}" ] && fail "${repo}/os/any/${pkg} should not exist"
-	[ -r "${FTP_BASE}/${repo}/os/any/${pkg}.sig" ] && fail "${repo}/os/any/${pkg}.sig should not exist"
 }
 
 checkAnyPackage() {
-- 
cgit v1.2.3-24-g4f1b