From fe19d9cff1cb41ed8456e4cce7be474599cbf503 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 10 Jun 2012 12:02:50 +0200
Subject: Remove support for packages that are not in the package pool

---
 db-functions                   | 11 ----------
 db-move                        |  5 -----
 test/test.d/pool-transition.sh | 48 ------------------------------------------
 3 files changed, 64 deletions(-)
 delete mode 100755 test/test.d/pool-transition.sh

diff --git a/db-functions b/db-functions
index c992fe5..de5e8b8 100644
--- a/db-functions
+++ b/db-functions
@@ -421,17 +421,6 @@ check_pkgrepos() {
 	[ -f "${FTP_BASE}/${PKGPOOL}/${pkgfile##*/}" ] && return 1
 	[ -f "${FTP_BASE}/${PKGPOOL}/${pkgfile##*/}.sig" ] && return 1
 
-	local repo
-	local arch
-	for repo in ${PKGREPOS[@]}; do
-		for arch in ${ARCHES[@]}; do
-			[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkgname}-${pkgver}-${pkgarch}"${PKGEXT} ] && return 1
-			[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkgname}-${pkgver}-${pkgarch}"${PKGEXT}.sig ] && return 1
-			[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkgfile##*/}" ] && return 1
-			[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkgfile##*/}.sig" ] && return 1
-		done
-	done
-
 	return 0
 }
 
diff --git a/db-move b/db-move
index 2bb2ea8..8ea7431 100755
--- a/db-move
+++ b/db-move
@@ -98,11 +98,6 @@ for pkgbase in ${args[@]:2}; do
 					pkgpath=$(getpkgfile "${ftppath_from}/${tarch}/"${pkgname}-${pkgver}-${pkgarch}${PKGEXT})
 					pkgfile="${pkgpath##*/}"
 
-					# copy package to pool if needed
-					# TODO: can be removed once every package has been moved to the package pool
-					if [ ! -f ${FTP_BASE}/${PKGPOOL}/${pkgfile} ]; then
-						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}/
diff --git a/test/test.d/pool-transition.sh b/test/test.d/pool-transition.sh
deleted file mode 100755
index 7880b0a..0000000
--- a/test/test.d/pool-transition.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-curdir=$(readlink -e $(dirname $0))
-. "${curdir}/../lib/common.inc"
-
-testMovePackagesWithoutPool() {
-	local arches=('i686' 'x86_64')
-	local pkgs=('pkg-simple-a' 'pkg-simple-b' 'pkg-split-a' 'pkg-split-b')
-	local pkgbase
-	local arch
-	local pkg
-	local old
-
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			releasePackage testing ${pkgbase} ${arch}
-		done
-	done
-
-	../db-update
-
-	# transform two packages to old style layout
-	for arch in ${arches[@]}; do
-		for old in 0 2; do
-			for pkg in "${pkgdir}/${pkgs[${old}]}"/*-${arch}${PKGEXT}; do
-				pkg=${pkg##*/}
-				mv -f "${FTP_BASE}/${PKGPOOL}/${pkg}" "${FTP_BASE}/testing/os/${arch}/${pkg}"
-			done
-		done
-	done
-
-	../cron-jobs/ftpdir-cleanup >/dev/null
-
-	../db-move testing extra ${pkgs[@]}
-
-	../cron-jobs/ftpdir-cleanup >/dev/null
-
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			for pkg in "${pkgdir}/${pkgbase}"/*-${arch}${PKGEXT}; do
-				checkPackage extra ${pkg##*/} ${arch}
-			done
-			checkRemovedPackage testing ${pkgbase} ${arch}
-		done
-	done
-}
-
-. "${curdir}/../lib/shunit2"
-- 
cgit v1.2.3-24-g4f1b