diff options
Diffstat (limited to 'test/test.d/pool-transition.sh')
| -rwxr-xr-x | test/test.d/pool-transition.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/test.d/pool-transition.sh b/test/test.d/pool-transition.sh index 390d097..ff5b3ea 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}/${native_packages_pool}/${pkg}" "${root_dir}/testing/os/${arch}/${pkg}" + mv -f "${root_dir}/${main_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}/${native_packages_pool}/${pkg1}" "${root_dir}/extra/os/any" + mv -f "${root_dir}/${main_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}/${native_packages_pool}/${pkg1}" ] && fail "${native_packages_pool}/${pkg1} found" + [ -f "${root_dir}/${main_packages_pool}/${pkg1}" ] && fail "${main_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}/${native_packages_pool}/${pkg}" "${root_dir}/testing/os/any/${pkg}" + mv -f "${root_dir}/${main_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}/${native_packages_pool}/${pkg}" "${root_dir}/extra/os/any/${pkg}" + mv -f "${root_dir}/${main_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 |