remove deprecated sources_pool and packages_pool variables

15 files changed, 77 insertions, 83 deletions

diff --git a/createrepos b/createrepos
index c89b1d3..df279bd 100755
--- a/createrepos
+++ b/createrepos
@@ -3,6 +3,6 @@
 
 source "$(dirname "$(readlink -e "$0")")/etc/dbscripts.cfg"
 
-mkdir -p -- "${root_dir}"/{"${packages_pool}","${sources_pool}"} "${cleanup_destination_directory}" "${source_cleanup_destination_directory}" "${staging_directory}"
+mkdir -p -- "${root_dir}"/{"${native_packages_pool}","${native_sources_pool}"} "${cleanup_destination_directory}" "${source_cleanup_destination_directory}" "${staging_directory}"
 
 "$(dirname "$(readlink -e "$0")")/create-repo" "${repositories[@]}"
diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index ad33b19..254b1c9 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -54,7 +54,7 @@ for repo in "${repositories[@]}"; do
 done
 
 # get a list of all available packages in the pacakge pool
-find "${root_dir}/${packages_pool}" -name "*${package_extension_suffixfile}" -printf '%f\n' | sort > "${work_directory}/pool"
+find "${root_dir}/${native_packages_pool}" -name "*${package_extension_suffixfile}" -printf '%f\n' | sort > "${work_directory}/pool"
 # create a list of packages in our db
 cat "${work_directory}/db-"* | sort -u > "${work_directory}/db"
 
@@ -63,7 +63,7 @@ if [ ${#old_pkgs[@]} -ge 1 ]; then
 	msg "Removing old packages from package pool..."
 	for old_pkg in "${old_pkgs[@]}"; do
 		msg2 '%s' "${old_pkg}"
-		clean_pkg "${root_dir}/${packages_pool}/${old_pkg}"
+		clean_pkg "${root_dir}/${native_packages_pool}/${old_pkg}"
 	done
 fi
 
diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index 2e7b7be..d01b91b 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -46,7 +46,7 @@ for repo in "${repositories[@]}"; do
 done
 
 # Create a list of all available source package file names
-find "${root_dir}/${sources_pool}" -xtype f -name "*${source_extension_suffixfile}" -printf '%f\n' | sort -u > "${work_directory}/available-src-pkgs"
+find "${root_dir}/${native_sources_pool}" -xtype f -name "*${source_extension_suffixfile}" -printf '%f\n' | sort -u > "${work_directory}/available-src-pkgs"
 
 # Check for all packages if we need to build a source package
 for repo in "${repositories[@]}"; do
@@ -91,7 +91,7 @@ for repo in "${repositories[@]}"; do
 			pushd "${work_directory}/pkgbuilds/${repo}-${pkgarch}/${pkgbase}" >/dev/null
 			SRCPKGDEST=. makepkg --nocolor --allsource --ignorearch --skippgpcheck >"${work_directory}/${pkgbase}.log" 2>&1
 			if [ $? -eq 0 ] && [ -f "${pkgbase}-${pkgver}${source_extension_suffixfile}" ]; then
-				mv_acl "${pkgbase}-${pkgver}${source_extension_suffixfile}" "${root_dir}/${sources_pool}/${pkgbase}-${pkgver}${source_extension_suffixfile}"
+				mv_acl "${pkgbase}-${pkgver}${source_extension_suffixfile}" "${root_dir}/${native_sources_pool}/${pkgbase}-${pkgver}${source_extension_suffixfile}"
 				# Avoid creating the same source package for every arch
 				echo "${pkgbase}-${pkgver}${source_extension_suffixfile}" >> "${work_directory}/available-src-pkgs"
 				newpkgs+=("${pkgbase}-${pkgver}${source_extension_suffixfile}")
@@ -128,7 +128,7 @@ if [ ${#old_pkgs[@]} -ge 1 ]; then
 	for old_pkg in "${old_pkgs[@]}"; do
 		msg2 '%s' "${old_pkg}"
 		if ! "${source_cleanup_dryrun}"; then
-			mv_acl "${root_dir}/${sources_pool}/${old_pkg}" "${source_cleanup_destination_directory}/${old_pkg}"
+			mv_acl "${root_dir}/${native_sources_pool}/${old_pkg}" "${source_cleanup_destination_directory}/${old_pkg}"
 			touch "${source_cleanup_destination_directory}/${old_pkg}"
 		fi
 	done
diff --git a/db-cleanup b/db-cleanup
index 432f3f2..75a9744 100755
--- a/db-cleanup
+++ b/db-cleanup
@@ -53,7 +53,7 @@ done
 
 msg "Removing old files:"
 
-for POOL in "${packages_pools[@]}" "${sources_pools[@]}"; do
+for POOL in "${native_packages_pool}" "${native_sources_pool}"; do
 	msg2 '%s' "${POOL}"
 
 	rsync "${EXTRAFLAGS[@]}" -va --delete-excluded \
diff --git a/db-move b/db-move
index 211e191..3d2b551 100755
--- a/db-move
+++ b/db-move
@@ -81,11 +81,11 @@ for pkgbase in "${args[@]:2}"; do
 					pkgpath=$(getpkgfile "${ftppath_from}/${tarch}/${pkgname}-${pkgver}-${pkgarch}"${package_extension_suffixfile})
 					pkgfile="${pkgpath##*/}"
 
-					ln -s "../../../${packages_pool}/${pkgfile}" "${ftppath_to}/${tarch}/"
-					if [ -f "${root_dir}/${packages_pool}/${pkgfile}.sig" ]; then
-						ln -s "../../../${packages_pool}/${pkgfile}.sig" "${ftppath_to}/${tarch}/"
+					ln -s "../../../${native_packages_pool}/${pkgfile}" "${ftppath_to}/${tarch}/"
+					if [ -f "${root_dir}/${native_packages_pool}/${pkgfile}.sig" ]; then
+						ln -s "../../../${native_packages_pool}/${pkgfile}.sig" "${ftppath_to}/${tarch}/"
 					fi
-					add_pkgs[${tarch}]+="${root_dir}/${packages_pool}/${pkgfile} "
+					add_pkgs[${tarch}]+="${root_dir}/${native_packages_pool}/${pkgfile} "
 					remove_pkgs[${tarch}]+="${pkgname} "
 				done
 			done
diff --git a/db-update b/db-update
index 60f3142..5359959 100755
--- a/db-update
+++ b/db-update
@@ -68,17 +68,17 @@ for repo in "${repos[@]}"; do
 			msg2 "%s (%s)" "${pkgfile}" "${pkgarch}"
 			# any packages might have been moved by the previous run
 			if [ -f "${pkg}" ]; then
-				mv "${pkg}" "${root_dir}/${packages_pool}"
+				mv "${pkg}" "${root_dir}/${native_packages_pool}"
 			fi
-			ln -s "../../../${packages_pool}/${pkgfile}" "${root_dir}/$repo/os/${pkgarch}"
+			ln -s "../../../${native_packages_pool}/${pkgfile}" "${root_dir}/$repo/os/${pkgarch}"
 			# also move signatures
 			if [ -f "${pkg}.sig" ]; then
-				mv "${pkg}.sig" "${root_dir}/${packages_pool}"
+				mv "${pkg}.sig" "${root_dir}/${native_packages_pool}"
 			fi
-			if [ -f "${root_dir}/${packages_pool}/${pkgfile}.sig" ]; then
-				ln -s "../../../${packages_pool}/${pkgfile}.sig" "${root_dir}/$repo/os/${pkgarch}"
+			if [ -f "${root_dir}/${native_packages_pool}/${pkgfile}.sig" ]; then
+				ln -s "../../../${native_packages_pool}/${pkgfile}.sig" "${root_dir}/$repo/os/${pkgarch}"
 			fi
-			add_dirs+=("${staging_directory}/abslibre/$(getpkgarch "${root_dir}/$packages_pool/$pkgfile")/$repo/$(getpkgbase "${root_dir}/$packages_pool/$pkgfile")")
+			add_dirs+=("${staging_directory}/abslibre/$(getpkgarch "${root_dir}/$native_packages_pool/$pkgfile")/$repo/$(getpkgbase "${root_dir}/$native_packages_pool/$pkgfile")")
 			add_pkgs+=("${pkgfile}")
 		done
 		for add_dir in "${add_dirs[@]}"; do
diff --git a/etc/dbscripts.d/gnu+linux.cfg b/etc/dbscripts.d/gnu+linux.cfg
index c9fce98..0a6f668 100644
--- a/etc/dbscripts.d/gnu+linux.cfg
+++ b/etc/dbscripts.d/gnu+linux.cfg
@@ -15,18 +15,16 @@ derivative_native_repositories=()
 multilib_repositories=("${main_multilib_repositories[@]}" "${derivative_multilib_repositories[@]}")
 main_repositories=("${main_native_repositories[@]}" "${derivative_native_repositories[@]}")
 repositories=("${main_repositories[@]}") # legacy
-packages_pool='pool/parabola_gnu+linux' # legacy
-sources_pool='sources/parabola_gnu+linux' # legacy
 
 # Directories where packages are shared between repos
 # *relative to root_dir*
-native_packages_pools=(pool/parabola_gnu+linux)
+native_packages_pool='pool/parabola_gnu+linux-libre'
 derivative_packages_pools=()
-packages_pools=(${native_packages_pools[@]} ${derivative_packages_pools[@]}) # legacy
+native_packages_pool=(${native_native_packages_pool[@]} ${derivative_packages_pools[@]}) # legacy
 # Directories where sources are stored
-native_sources_pools=(sources/parabola_gnu+linux)
+native_sources_pool='sources/parabola_gnu+linux-libre'
 derivative_sources_pools=()
-sources_pools=(${native_sources_pools[@]} ${derivative_sources_pools[@]}) # legacy
+native_sources_pool=(${native_native_sources_pool[@]} ${derivative_sources_pools[@]}) # legacy
 
 multilib_architectures=()
 native_architectures=('mips64el')
diff --git a/etc/dbscripts.d/gnu+linux_arm_arch_legacy.cfg b/etc/dbscripts.d/gnu+linux_arm_arch_legacy.cfg
index eddd69e..11e529a 100644
--- a/etc/dbscripts.d/gnu+linux_arm_arch_legacy.cfg
+++ b/etc/dbscripts.d/gnu+linux_arm_arch_legacy.cfg
@@ -15,18 +15,16 @@ derivative_native_repositories=('core' 'extra' 'community' 'aur' 'alarm')
 multilib_repositories=("${main_multilib_repositories[@]}" "${derivative_multilib_repositories[@]}")
 main_repositories=("${main_native_repositories[@]}" "${derivative_native_repositories[@]}")
 repositories=("${main_repositories[@]}") # legacy
-packages_pool='pool/parabola' # legacy
-sources_pool='sources/parabola' # legacy
 
 # Directories where packages are shared between repos
 # *relative to root_dir*
-native_packages_pools=(pool/parabola)
-derivative_packages_pools=(pool/arch_gnu+linux-arm_main)
-packages_pools=(${native_packages_pools[@]} ${derivative_packages_pools[@]}) # legacy
+native_packages_pool='pool/parabola'
+derivative_packages_pools=('pool/arch_gnu+linux-arm')
+native_packages_pool=(${native_native_packages_pool[@]} ${derivative_packages_pools[@]}) # legacy
 # Directories where sources are stored
-native_sources_pools=(sources/parabola)
-derivative_sources_pools=(sources/arch_gnu+linux-arm_main)
-sources_pools=(${native_sources_pools[@]} ${derivative_sources_pools[@]}) # legacy
+native_sources_pool='sources/parabola'
+derivative_sources_pools=('sources/arch_gnu+linux-arm')
+native_sources_pool=(${native_native_sources_pool[@]} ${derivative_sources_pools[@]}) # legacy
 
 multilib_architectures=()
 native_architectures=('arm' 'armv6h' 'armv7h' 'aarch64')
diff --git a/etc/dbscripts.d/gnu+linux_x86_arch_legacy.cfg b/etc/dbscripts.d/gnu+linux_x86_arch_legacy.cfg
index dea4e21..5d26523 100644
--- a/etc/dbscripts.d/gnu+linux_x86_arch_legacy.cfg
+++ b/etc/dbscripts.d/gnu+linux_x86_arch_legacy.cfg
@@ -17,18 +17,16 @@ derivative_native_repositories=('core' 'extra' 'testing' 'community'
 multilib_repositories=("${main_multilib_repositories[@]}" "${derivative_multilib_repositories[@]}")
 main_repositories=("${main_native_repositories[@]}" "${derivative_native_repositories[@]}")
 repositories=("${main_repositories[@]}") # legacy
-packages_pool='pool/parabola' # legacy
-sources_pool='sources/parabola' # legacy
 
 # Directories where packages are shared between repos
 # *relative to root_dir*
-native_packages_pools=(pool/parabola)
+native_packages_pool='pool/parabola'
 derivative_packages_pools=(pool/{packages,community})
-packages_pools=(${native_packages_pools[@]} ${derivative_packages_pools[@]}) # legacy
+native_packages_pool=(${native_native_packages_pool[@]} ${derivative_packages_pools[@]}) # legacy
 # Directories where sources are stored
-native_sources_pools=(sources/parabola)
+native_sources_pool='sources/parabola'
 derivative_sources_pools=(sources/{packages,community})
-sources_pools=(${native_sources_pools[@]} ${derivative_sources_pools[@]}) # legacy
+native_sources_pool=(${native_native_sources_pool[@]} ${derivative_sources_pools[@]}) # legacy
 
 multilib_architectures=('x86_64')
 native_architectures=('i686'
diff --git a/share/db-functions b/share/db-functions
index af99037..421404c 100644
--- a/share/db-functions
+++ b/share/db-functions
@@ -417,10 +417,10 @@ check_pkgrepos() {
 	local pkgarch="$(getpkgarch "${pkgfile}")"
 	[ $? -ge 1 ] && return 1
 
-	[ -f "${root_dir}/${packages_pool}/${pkgname}-${pkgver}-${pkgarch}"${package_extension_suffixfile} ] && return 1
-	[ -f "${root_dir}/${packages_pool}/${pkgname}-${pkgver}-${pkgarch}"${package_extension_suffixfile}.sig ] && return 1
-	[ -f "${root_dir}/${packages_pool}/${pkgfile##*/}" ] && return 1
-	[ -f "${root_dir}/${packages_pool}/${pkgfile##*/}.sig" ] && return 1
+	[ -f "${root_dir}/${native_packages_pool}/${pkgname}-${pkgver}-${pkgarch}"${package_extension_suffixfile} ] && return 1
+	[ -f "${root_dir}/${native_packages_pool}/${pkgname}-${pkgver}-${pkgarch}"${package_extension_suffixfile}.sig ] && return 1
+	[ -f "${root_dir}/${native_packages_pool}/${pkgfile##*/}" ] && return 1
+	[ -f "${root_dir}/${native_packages_pool}/${pkgfile##*/}.sig" ] && return 1
 
 	local repo
 	local arch
@@ -450,11 +450,11 @@ check_repo_permission() {
 	local repo=$1
 
 	[ ${#repositories[@]} -eq 0 ] && return 1
-	[ -z "${packages_pool}" ] && return 1
+	[ -z "${native_packages_pool}" ] && return 1
 
 	in_array "${repo}" "${repositories[@]}" || return 1
 
-	[ -w "${root_dir}/${packages_pool}" ] || return 1
+	[ -w "${root_dir}/${native_packages_pool}" ] || return 1
 
 	local arch
 	for arch in "${native_architectures[@]}"; do
diff --git a/test/lib/common.inc b/test/lib/common.inc
index f43d531..9ccf1c8 100644
--- a/test/lib/common.inc
+++ b/test/lib/common.inc
@@ -60,7 +60,7 @@ setUp() {
 	#msg "Using ${temporary_directory}"
 
 	repositories=('core' 'extra' 'testing')
-	packages_pool='pool/packages'
+	native_packages_pool='pool/packages'
 	mkdir -p "${temporary_directory}/"{ftp,tmp,staging,{package,source}-cleanup,svn-packages-{copy,repo}}
 
 	for r in ${repositories[@]}; do
@@ -69,8 +69,8 @@ setUp() {
 			mkdir -p "${temporary_directory}/ftp/${r}/os/${a}"
 		done
 	done
-	mkdir -p "${temporary_directory}/ftp/${packages_pool}"
-	mkdir -p "${temporary_directory}/ftp/${sources_pool}"
+	mkdir -p "${temporary_directory}/ftp/${native_packages_pool}"
+	mkdir -p "${temporary_directory}/ftp/${native_sources_pool}"
 
 	msg 'Creating svn repository...'
 	svnadmin create "${temporary_directory}/svn-packages-repo"
@@ -88,7 +88,7 @@ setUp() {
 	root_dir="${temporary_directory}/ftp"
 	SVN_repository="file://${temporary_directory}/svn-packages-repo"
 	repositories=(${repositories[@]})
-	packages_pool="${packages_pool}"
+	native_packages_pool="${native_packages_pool}"
 	cleanup_destination_directory="${temporary_directory}/package-cleanup"
 	source_cleanup_destination_directory="${temporary_directory}/source-cleanup"
 	staging_directory="${temporary_directory}/staging"
@@ -131,20 +131,20 @@ checkAnyPackageDB() {
 	local arch
 	local db
 
-	[ -r "${root_dir}/${packages_pool}/${pkg}" ] || fail "${packages_pool}/${pkg} not found"
+	[ -r "${root_dir}/${native_packages_pool}/${pkg}" ] || fail "${native_packages_pool}/${pkg} not found"
 	if ${require_signature}; then
-		[ -r "${root_dir}/${packages_pool}/${pkg}.sig" ] || fail "${packages_pool}/${pkg}.sig not found"
+		[ -r "${root_dir}/${native_packages_pool}/${pkg}.sig" ] || fail "${native_packages_pool}/${pkg}.sig not found"
 	fi
 
 	for arch in i686 x86_64; do
 		[ -L "${root_dir}/${repo}/os/${arch}/${pkg}" ] || fail "${repo}/os/${arch}/${pkg} is not a symlink"
-		[ "$(readlink -e "${root_dir}/${repo}/os/${arch}/${pkg}")" == "${root_dir}/${packages_pool}/${pkg}" ] \
-			|| fail "${repo}/os/${arch}/${pkg} does not link to ${packages_pool}/${pkg}"
+		[ "$(readlink -e "${root_dir}/${repo}/os/${arch}/${pkg}")" == "${root_dir}/${native_packages_pool}/${pkg}" ] \
+			|| fail "${repo}/os/${arch}/${pkg} does not link to ${native_packages_pool}/${pkg}"
 
 		if ${require_signature}; then
 			[ -L "${root_dir}/${repo}/os/${arch}/${pkg}.sig" ] || fail "${repo}/os/${arch}/${pkg}.sig is not a symlink"
-			[ "$(readlink -e "${root_dir}/${repo}/os/${arch}/${pkg}.sig")" == "${root_dir}/${packages_pool}/${pkg}.sig" ] \
-				|| fail "${repo}/os/${arch}/${pkg}.sig does not link to ${packages_pool}/${pkg}.sig"
+			[ "$(readlink -e "${root_dir}/${repo}/os/${arch}/${pkg}.sig")" == "${root_dir}/${native_packages_pool}/${pkg}.sig" ] \
+				|| fail "${repo}/os/${arch}/${pkg}.sig does not link to ${native_packages_pool}/${pkg}.sig"
 		fi
 	done
 	[ -r "${staging_directory}"/${repo}/${pkg} ] && fail "${repo}/${pkg} found in staging directory"
@@ -166,7 +166,7 @@ checkAnyPackage() {
 
 	checkAnyPackageDB $repo $pkg
 
-	local pkgbase=$(getpkgbase "${root_dir}/${packages_pool}/${pkg}")
+	local pkgbase=$(getpkgbase "${root_dir}/${native_packages_pool}/${pkg}")
 	svn up -q "${temporary_directory}/svn-packages-copy/${pkgbase}"
 	[ -d "${temporary_directory}/svn-packages-copy/${pkgbase}/repos/${repo}-any" ] \
 		|| fail "svn-packages-copy/${pkgbase}/repos/${repo}-any does not exist"
@@ -178,20 +178,20 @@ checkPackageDB() {
 	local arch=$3
 	local db
 
-	[ -r "${root_dir}/${packages_pool}/${pkg}" ] || fail "${packages_pool}/${pkg} not found"
+	[ -r "${root_dir}/${native_packages_pool}/${pkg}" ] || fail "${native_packages_pool}/${pkg} not found"
 	[ -L "${root_dir}/${repo}/os/${arch}/${pkg}" ] || fail "${repo}/os/${arch}/${pkg} not a symlink"
 	[ -r "${staging_directory}"/${repo}/${pkg} ] && fail "${repo}/${pkg} found in staging directory"
 
-	[ "$(readlink -e "${root_dir}/${repo}/os/${arch}/${pkg}")" == "${root_dir}/${packages_pool}/${pkg}" ] \
-		|| fail "${repo}/os/${arch}/${pkg} does not link to ${packages_pool}/${pkg}"
+	[ "$(readlink -e "${root_dir}/${repo}/os/${arch}/${pkg}")" == "${root_dir}/${native_packages_pool}/${pkg}" ] \
+		|| fail "${repo}/os/${arch}/${pkg} does not link to ${native_packages_pool}/${pkg}"
 
 	if ${require_signature}; then
-		[ -r "${root_dir}/${packages_pool}/${pkg}.sig" ] || fail "${packages_pool}/${pkg}.sig not found"
+		[ -r "${root_dir}/${native_packages_pool}/${pkg}.sig" ] || fail "${native_packages_pool}/${pkg}.sig not found"
 		[ -L "${root_dir}/${repo}/os/${arch}/${pkg}.sig" ] || fail "${repo}/os/${arch}/${pkg}.sig is not a symlink"
 		[ -r "${staging_directory}"/${repo}/${pkg}.sig ] && fail "${repo}/${pkg}.sig found in staging directory"
 
-		[ "$(readlink -e "${root_dir}/${repo}/os/${arch}/${pkg}.sig")" == "${root_dir}/${packages_pool}/${pkg}.sig" ] \
-			|| fail "${repo}/os/${arch}/${pkg}.sig does not link to ${packages_pool}/${pkg}.sig"
+		[ "$(readlink -e "${root_dir}/${repo}/os/${arch}/${pkg}.sig")" == "${root_dir}/${native_packages_pool}/${pkg}.sig" ] \
+			|| fail "${repo}/os/${arch}/${pkg}.sig does not link to ${native_packages_pool}/${pkg}.sig"
 	fi
 
 	for db in ${database_extension_suffixfile} ${files_extension_suffixfile}; do
@@ -208,7 +208,7 @@ checkPackage() {
 
 	checkPackageDB $repo $pkg $arch
 
-	local pkgbase=$(getpkgbase "${root_dir}/${packages_pool}/${pkg}")
+	local pkgbase=$(getpkgbase "${root_dir}/${native_packages_pool}/${pkg}")
 	svn up -q "${temporary_directory}/svn-packages-copy/${pkgbase}"
 	[ -d "${temporary_directory}/svn-packages-copy/${pkgbase}/repos/${repo}-${arch}" ] \
 		|| fail "svn-packages-copy/${pkgbase}/repos/${repo}-${arch} does not exist"
diff --git a/test/test.d/db-repo-add.sh b/test/test.d/db-repo-add.sh
index 3542dae..54dd704 100755
--- a/test/test.d/db-repo-add.sh
+++ b/test/test.d/db-repo-add.sh
@@ -11,10 +11,10 @@ testAddSimplePackages() {
 
 	for pkgbase in ${pkgs[@]}; do
 		for arch in ${arches[@]}; do
-			cp "${pkgdir}/${pkgbase}/${pkgbase}-1-1-${arch}.pkg.tar.xz" "${root_dir}/${packages_pool}/"
-			touch "${root_dir}/${packages_pool}/${pkgbase}-1-1-${arch}.pkg.tar.xz.sig"
-			ln -s "${root_dir}/${packages_pool}/${pkgbase}-1-1-${arch}.pkg.tar.xz" "${root_dir}/extra/os/${arch}/"
-			ln -s "${root_dir}/${packages_pool}/${pkgbase}-1-1-${arch}.pkg.tar.xz.sig" "${root_dir}/extra/os/${arch}/"
+			cp "${pkgdir}/${pkgbase}/${pkgbase}-1-1-${arch}.pkg.tar.xz" "${root_dir}/${native_packages_pool}/"
+			touch "${root_dir}/${native_packages_pool}/${pkgbase}-1-1-${arch}.pkg.tar.xz.sig"
+			ln -s "${root_dir}/${native_packages_pool}/${pkgbase}-1-1-${arch}.pkg.tar.xz" "${root_dir}/extra/os/${arch}/"
+			ln -s "${root_dir}/${native_packages_pool}/${pkgbase}-1-1-${arch}.pkg.tar.xz.sig" "${root_dir}/extra/os/${arch}/"
 			../db-repo-add extra ${arch} ${pkgbase}-1-1-${arch}.pkg.tar.xz
 		done
 	done
@@ -35,10 +35,10 @@ testAddMultiplePackages() {
 	for arch in ${arches[@]}; do
 		add_pkgs=()
 		for pkgbase in ${pkgs[@]}; do
-			cp "${pkgdir}/${pkgbase}/${pkgbase}-1-1-${arch}.pkg.tar.xz" "${root_dir}/${packages_pool}/"
-			touch "${root_dir}/${packages_pool}/${pkgbase}-1-1-${arch}.pkg.tar.xz.sig"
-			ln -s "${root_dir}/${packages_pool}/${pkgbase}-1-1-${arch}.pkg.tar.xz" "${root_dir}/extra/os/${arch}/"
-			ln -s "${root_dir}/${packages_pool}/${pkgbase}-1-1-${arch}.pkg.tar.xz.sig" "${root_dir}/extra/os/${arch}/"
+			cp "${pkgdir}/${pkgbase}/${pkgbase}-1-1-${arch}.pkg.tar.xz" "${root_dir}/${native_packages_pool}/"
+			touch "${root_dir}/${native_packages_pool}/${pkgbase}-1-1-${arch}.pkg.tar.xz.sig"
+			ln -s "${root_dir}/${native_packages_pool}/${pkgbase}-1-1-${arch}.pkg.tar.xz" "${root_dir}/extra/os/${arch}/"
+			ln -s "${root_dir}/${native_packages_pool}/${pkgbase}-1-1-${arch}.pkg.tar.xz.sig" "${root_dir}/extra/os/${arch}/"
 			add_pkgs[${#add_pkgs[*]}]=${pkgbase}-1-1-${arch}.pkg.tar.xz
 		done
 		../db-repo-add extra ${arch} ${add_pkgs[@]}
diff --git a/test/test.d/ftpdir-cleanup.sh b/test/test.d/ftpdir-cleanup.sh
index 3210fee..61f5758 100755
--- a/test/test.d/ftpdir-cleanup.sh
+++ b/test/test.d/ftpdir-cleanup.sh
@@ -26,7 +26,7 @@ testCleanupSimplePackages() {
 	for arch in ${arches[@]}; do
 		local pkg1="pkg-simple-a-1-1-${arch}.pkg.tar.xz"
 		checkRemovedPackage extra 'pkg-simple-a' ${arch}
-		[ -f "${root_dir}/${packages_pool}/${pkg1}" ] && fail "${packages_pool}/${pkg1} found"
+		[ -f "${root_dir}/${native_packages_pool}/${pkg1}" ] && fail "${native_packages_pool}/${pkg1} found"
 		[ -f "${root_dir}/${repo}/os/${arch}/${pkg1}" ] && fail "${repo}/os/${arch}/${pkg1} found"
 
 		local pkg2="pkg-simple-b-1-1-${arch}.pkg.tar.xz"
@@ -57,7 +57,7 @@ testCleanupEpochPackages() {
 	for arch in ${arches[@]}; do
 		local pkg1="pkg-simple-epoch-1:1-1-${arch}.pkg.tar.xz"
 		checkRemovedPackage extra 'pkg-simple-epoch' ${arch}
-		[ -f "${root_dir}/${packages_pool}/${pkg1}" ] && fail "${packages_pool}/${pkg1} found"
+		[ -f "${root_dir}/${native_packages_pool}/${pkg1}" ] && fail "${native_packages_pool}/${pkg1} found"
 		[ -f "${root_dir}/${repo}/os/${arch}/${pkg1}" ] && fail "${repo}/os/${arch}/${pkg1} found"
 	done
 }
@@ -77,7 +77,7 @@ testCleanupAnyPackages() {
 
 	local pkg1='pkg-any-a-1-1-any.pkg.tar.xz'
 	checkRemovedAnyPackage extra 'pkg-any-a'
-	[ -f "${root_dir}/${packages_pool}/${pkg1}" ] && fail "${packages_pool}/${pkg1} found"
+	[ -f "${root_dir}/${native_packages_pool}/${pkg1}" ] && fail "${native_packages_pool}/${pkg1} found"
 	[ -f "${root_dir}/${repo}/os/${arch}/${pkg1}" ] && fail "${repo}/os/${arch}/${pkg1} found"
 
 	local pkg2="pkg-any-b-1-1-${arch}.pkg.tar.xz"
@@ -108,7 +108,7 @@ testCleanupSplitPackages() {
 	for arch in ${arches[@]}; do
 		for pkg in "${pkgdir}/${pkgs[0]}"/*-${arch}${package_extension_suffixfile}; do
 			checkRemovedPackage extra ${pkgs[0]} ${arch}
-			[ -f "${root_dir}/${packages_pool}/${pkg}" ] && fail "${packages_pool}/${pkg} found"
+			[ -f "${root_dir}/${native_packages_pool}/${pkg}" ] && fail "${native_packages_pool}/${pkg} found"
 			[ -f "${root_dir}/${repo}/os/${arch}/${pkg}" ] && fail "${repo}/os/${arch}/${pkg} found"
 		done
 
diff --git a/test/test.d/pool-transition.sh b/test/test.d/pool-transition.sh
index 1d00ee7..390d097 100755
--- a/test/test.d/pool-transition.sh
+++ b/test/test.d/pool-transition.sh
@@ -24,7 +24,7 @@ testMovePackagesWithoutPool() {
 		for old in 0 2; do
 			for pkg in "${pkgdir}/${pkgs[${old}]}"/*-${arch}${package_extension_suffixfile}; do
 				pkg=$(basename $pkg)
-				mv -f "${root_dir}/${packages_pool}/${pkg}" "${root_dir}/testing/os/${arch}/${pkg}"
+				mv -f "${root_dir}/${native_packages_pool}/${pkg}" "${root_dir}/testing/os/${arch}/${pkg}"
 			done
 		done
 	done
@@ -55,7 +55,7 @@ testUpdateAnyPackageWithoutPool() {
 	releasePackage extra pkg-any-a any
 	../db-update
 	# transform two packages to old style layout
-	mv -f "${root_dir}/${packages_pool}/${pkg1}" "${root_dir}/extra/os/any"
+	mv -f "${root_dir}/${native_packages_pool}/${pkg1}" "${root_dir}/extra/os/any"
 	for arch in i686 x86_64; do
 		ln -sf "../any/${pkg1}" "${root_dir}/extra/os/${arch}"
 	done
@@ -75,7 +75,7 @@ testUpdateAnyPackageWithoutPool() {
 
 	checkAnyPackage extra "${pkg2}"
 
-	[ -f "${root_dir}/${packages_pool}/${pkg1}" ] && fail "${packages_pool}/${pkg1} found"
+	[ -f "${root_dir}/${native_packages_pool}/${pkg1}" ] && fail "${native_packages_pool}/${pkg1} found"
 	for arch in any i686 x86_64; do
 		[ -f "${root_dir}/extra/os/${arch}/${pkg1}" ] && fail "extra/os/${arch}/${pkg1} found"
 	done
@@ -96,7 +96,7 @@ testMoveAnyPackagesWithoutPool() {
 	# transform a package to old style layout
 	for pkg in "${pkgdir}/${pkgs[0]}"/*-any${package_extension_suffixfile}; do
 		pkg=$(basename $pkg)
-		mv -f "${root_dir}/${packages_pool}/${pkg}" "${root_dir}/testing/os/any/${pkg}"
+		mv -f "${root_dir}/${native_packages_pool}/${pkg}" "${root_dir}/testing/os/any/${pkg}"
 		for arch in i686 x86_64; do
 			ln -sf "../any/${pkg}" "${root_dir}/testing/os/${arch}/${pkg}"
 		done
@@ -133,7 +133,7 @@ testUpdateSameAnyPackageToDifferentRepositoriesWithoutPool() {
 	# transform a package to old style layout
 	for pkg in "${pkgdir}/pkg-any-a"/*-any${package_extension_suffixfile}; do
 		pkg=$(basename $pkg)
-		mv -f "${root_dir}/${packages_pool}/${pkg}" "${root_dir}/extra/os/any/${pkg}"
+		mv -f "${root_dir}/${native_packages_pool}/${pkg}" "${root_dir}/extra/os/any/${pkg}"
 		for arch in i686 x86_64; do
 			ln -sf "../any/${pkg}" "${root_dir}/extra/os/${arch}/${pkg}"
 		done
diff --git a/test/test.d/sourceballs.sh b/test/test.d/sourceballs.sh
index 40debb6..314f2e5 100755
--- a/test/test.d/sourceballs.sh
+++ b/test/test.d/sourceballs.sh
@@ -18,7 +18,7 @@ testSourceballs() {
 
 	../cron-jobs/sourceballs
 	for pkgbase in ${pkgs[@]}; do
-		[ ! -r ${root_dir}/${sources_pool}/${pkgbase}-*${source_extension_suffixfile} ] && fail "source package not found!"
+		[ ! -r ${root_dir}/${native_sources_pool}/${pkgbase}-*${source_extension_suffixfile} ] && fail "source package not found!"
 	done
 }
 
@@ -33,7 +33,7 @@ testAnySourceballs() {
 
 	../cron-jobs/sourceballs
 	for pkgbase in ${pkgs[@]}; do
-		[ ! -r ${root_dir}/${sources_pool}/${pkgbase}-*${source_extension_suffixfile} ] && fail "source package not found!"
+		[ ! -r ${root_dir}/${native_sources_pool}/${pkgbase}-*${source_extension_suffixfile} ] && fail "source package not found!"
 	done
 }
 
@@ -54,7 +54,7 @@ testSplitSourceballs() {
 
 	../cron-jobs/sourceballs
 	for pkgbase in ${pkgs[@]}; do
-		[ ! -r ${root_dir}/${sources_pool}/${pkgbase}-*${source_extension_suffixfile} ] && fail "source package not found!"
+		[ ! -r ${root_dir}/${native_sources_pool}/${pkgbase}-*${source_extension_suffixfile} ] && fail "source package not found!"
 	done
 }
 
@@ -77,8 +77,8 @@ testSourceballsCleanup() {
 	done
 
 	../cron-jobs/sourceballs
-	[ -r ${root_dir}/${sources_pool}/pkg-simple-a-*${source_extension_suffixfile} ] && fail "source package was not removed!"
-	[ ! -r ${root_dir}/${sources_pool}/pkg-simple-b-*${source_extension_suffixfile} ] && fail "source package not found!"
+	[ -r ${root_dir}/${native_sources_pool}/pkg-simple-a-*${source_extension_suffixfile} ] && fail "source package was not removed!"
+	[ ! -r ${root_dir}/${native_sources_pool}/pkg-simple-b-*${source_extension_suffixfile} ] && fail "source package not found!"
 }
 
 source "${curdir}/../lib/shunit2"