From ab53d40da0070cff1f1d3bbae8664918a90076b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Thu, 24 Sep 2015 00:26:02 -0300 Subject: remane main -> native (if not derivation) and native -> main (if not multilib) --- any-to-ours | 2 +- create-repo | 2 +- createrepos | 4 +-- cron-jobs/ftpdir-cleanup | 12 ++++---- cron-jobs/repo-sanity-check | 2 +- cron-jobs/sourceballs | 20 ++++++------ db-check-nonfree | 10 +++--- db-cleanup | 6 ++-- db-list-unsigned-packages | 2 +- db-move | 22 +++++++------- db-remove | 2 +- db-repo-add | 2 +- db-repo-remove | 2 +- db-sync | 4 +-- db-update | 22 +++++++------- etc/dbscripts.d/gnu+linux.cfg | 16 +++++----- etc/dbscripts.d/gnu+linux_arm_arch_legacy.cfg | 16 +++++----- etc/dbscripts.d/gnu+linux_x86_arch_legacy.cfg | 18 +++++------ mkrepo | 2 +- share/db-functions | 26 ++++++++-------- test/lib/common.inc | 44 +++++++++++++-------------- test/test.d/db-repo-add.sh | 16 +++++----- test/test.d/ftpdir-cleanup.sh | 8 ++--- test/test.d/pool-transition.sh | 10 +++--- test/test.d/sourceballs.sh | 10 +++--- 25 files changed, 140 insertions(+), 140 deletions(-) diff --git a/any-to-ours b/any-to-ours index 6c38215..97f664b 100755 --- a/any-to-ours +++ b/any-to-ours @@ -21,7 +21,7 @@ trap 'trap_exit "$(gettext "An unknown error has occurred. Exiting...")"' ERR BASEARCH='x86_64' # Traverse all Arch repos -for _repo in "${derivative_native_repositories[@]}"; do +for _repo in "${derivative_main_repositories[@]}"; do msg "Processing %s..." "${_repo}" # Find 'any' packages diff --git a/create-repo b/create-repo index 89233c7..7f7ce60 100755 --- a/create-repo +++ b/create-repo @@ -12,7 +12,7 @@ fi msg "Creating repos..." for _repo in "$@"; do msg2 "Creating [%s]" "${_repo}" - for _arch in "${native_architectures[@]}"; do + for _arch in "${main_architectures[@]}"; do mkdir -p "${root_dir}/${_repo}/os/${_arch}" || \ error "Failed creating %s dir" "${_arch}" done diff --git a/createrepos b/createrepos index 4565d8a..b00359d 100755 --- a/createrepos +++ b/createrepos @@ -3,6 +3,6 @@ source "$(dirname "$(readlink -e "$0")")/etc/dbscripts.cfg" -mkdir -p -- "${root_dir}"/{"${main_packages_pool}","${main_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" "${native_repositories[@]}" +"$(dirname "$(readlink -e "$0")")/create-repo" "${main_repositories[@]}" diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup index e4de31b..fa91689 100755 --- a/cron-jobs/ftpdir-cleanup +++ b/cron-jobs/ftpdir-cleanup @@ -24,8 +24,8 @@ clean_pkg() { "${cleanup_dryrun}" && warning 'dry run mode is active' -for repo in "${native_repositories[@]}"; do - for arch in "${native_architectures[@]}"; do +for repo in "${main_repositories[@]}"; do + for arch in "${main_architectures[@]}"; do if [ ! -f "${root_dir}/${repo}/os/${arch}/${repo}${database_extension_suffixfile}" ]; then continue fi @@ -54,7 +54,7 @@ for repo in "${native_repositories[@]}"; do done # get a list of all available packages in the pacakge pool -find "${root_dir}/${main_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}/${main_packages_pool}/${old_pkg}" + clean_pkg "${root_dir}/${native_packages_pool}/${old_pkg}" done fi @@ -79,8 +79,8 @@ if [ ${#old_pkgs[@]} -ge 1 ]; then done fi -for repo in "${native_repositories[@]}"; do - for arch in "${native_architectures[@]}"; do +for repo in "${main_repositories[@]}"; do + for arch in "${main_architectures[@]}"; do repo_unlock "${repo}" "${arch}" done done diff --git a/cron-jobs/repo-sanity-check b/cron-jobs/repo-sanity-check index bf1cac6..aacac8a 100755 --- a/cron-jobs/repo-sanity-check +++ b/cron-jobs/repo-sanity-check @@ -8,7 +8,7 @@ source "$(dirname "$(readlink -e "$0")")/../etc/dbscripts.cfg" source "$(dirname "$(readlink -e "$0")")/../share/db-functions" # Traverse all repos -for _repo in "${native_repositories[@]}"; do +for _repo in "${main_repositories[@]}"; do msg "Cleaning up [%s]" "${_repo}" # Find all pkgnames on this repo's abs diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs index 54a493d..bd9b3c0 100755 --- a/cron-jobs/sourceballs +++ b/cron-jobs/sourceballs @@ -7,8 +7,8 @@ pushd "${work_directory}" >/dev/null script_lock -for repo in "${native_repositories[@]}"; do - for arch in "${native_architectures[@]}"; do +for repo in "${main_repositories[@]}"; do + for arch in "${main_architectures[@]}"; do repo_lock "${repo}" "${arch}" || exit 1 done done @@ -18,8 +18,8 @@ renice +10 -p $$ > /dev/null # Create a readable file for each repo with the following format # - [ ] -for repo in "${native_repositories[@]}"; do - for arch in "${native_architectures[@]}"; do +for repo in "${main_repositories[@]}"; do + for arch in "${main_architectures[@]}"; do # Repo does not exist; skip it if [ ! -f "${root_dir}/${repo}/os/${arch}/${repo}${database_extension_suffixfile}" ]; then continue @@ -39,17 +39,17 @@ for repo in "${native_repositories[@]}"; do done | sort -u > "${work_directory}/db-${repo}" done -for repo in "${native_repositories[@]}"; do - for arch in "${native_architectures[@]}"; do +for repo in "${main_repositories[@]}"; do + for arch in "${main_architectures[@]}"; do repo_unlock "${repo}" "${arch}" done done # Create a list of all available source package file names -find "${root_dir}/${main_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 "${native_repositories[@]}"; do +for repo in "${main_repositories[@]}"; do newpkgs=() failedpkgs=() while read line; do @@ -91,7 +91,7 @@ for repo in "${native_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}/${main_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}/${main_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-check-nonfree b/db-check-nonfree index 75c9626..1988c43 100755 --- a/db-check-nonfree +++ b/db-check-nonfree @@ -8,17 +8,17 @@ if [ $# -ge 1 ]; then exit 1 fi -# TODO: this might lock too much (native_architectures) +# TODO: this might lock too much (main_architectures) for repo in "${repos[@]}"; do - for pkgarch in "${native_architectures[@]}"; do + for pkgarch in "${main_architectures[@]}"; do repo_lock "${repo}" "${pkgarch}" || exit 1 done done msg "Check nonfree in repo:" nonfree=($(cut -d: -f1 "${blacklist_file}" | sort -u)) -for repo in "${derivative_native_repositories[@]}"; do - for pkgarch in "${native_architectures[@]}"; do +for repo in "${derivative_main_repositories[@]}"; do + for pkgarch in "${main_architectures[@]}"; do msg2 "%s %s" "$repo" "$pkgarch" if [ ! -f "${root_dir}/${repo}/os/${pkgarch}/${repo}${database_extension_suffixfile}" ]; then continue @@ -40,7 +40,7 @@ for repo in "${derivative_native_repositories[@]}"; do done for repo in "${repos[@]}"; do - for pkgarch in "${native_architectures[@]}"; do + for pkgarch in "${main_architectures[@]}"; do repo_unlock "${repo}" "${pkgarch}" done done diff --git a/db-cleanup b/db-cleanup index a6ab160..a868c02 100755 --- a/db-cleanup +++ b/db-cleanup @@ -31,8 +31,8 @@ EXTRAFLAGS=() filter=$(mktemp -t "${0##*/}.XXXXXXXXXX") trap "rm -f -- $(printf %q "$filter")" EXIT -for _repo in "${native_repositories[@]}"; do - for _arch in "${native_architectures[@]}"; do +for _repo in "${main_repositories[@]}"; do + for _arch in "${main_architectures[@]}"; do msg "Getting %s-%s database" "${_repo}" "${_arch}" dbfile="${root_dir}/${_repo}/os/${_arch}/${_repo}${database_extension_suffixfile}" @@ -53,7 +53,7 @@ done msg "Removing old files:" -for POOL in "${main_packages_pool}" "${main_sources_pool}"; do +for POOL in "${native_packages_pool}" "${native_sources_pool}"; do msg2 '%s' "${POOL}" rsync "${EXTRAFLAGS[@]}" -va --delete-excluded \ diff --git a/db-list-unsigned-packages b/db-list-unsigned-packages index 0a7831c..9a531d6 100755 --- a/db-list-unsigned-packages +++ b/db-list-unsigned-packages @@ -31,7 +31,7 @@ fi arch=$1 shift -for repo in "${native_repositories[@]}" +for repo in "${main_repositories[@]}" do db="${root_dir}/${repo}/os/${arch}/${repo}.db" [ -f "$db" ] && "$(dirname "$(readlink -e "$0")")/db-list-unsigned-packages.py" "$repo" "$@" < "$db" diff --git a/db-move b/db-move index c35aac1..0ec252e 100755 --- a/db-move +++ b/db-move @@ -18,15 +18,15 @@ if ! check_repo_permission "$repo_to" || ! check_repo_permission "$repo_from"; t die "You don't have permission to move packages from %s to %s" "${repo_from}" "${repo_to}" fi -# TODO: this might lock too much (native_architectures) -for pkgarch in "${native_architectures[@]}"; do +# TODO: this might lock too much (main_architectures) +for pkgarch in "${main_architectures[@]}"; do repo_lock "${repo_to}" "${pkgarch}" || exit 1 repo_lock "${repo_from}" "${pkgarch}" || exit 1 done # First loop is to check that all necessary files exist for pkgbase in "${args[@]:2}"; do - for pkgarch in "${native_architectures[@]}" 'any'; do + for pkgarch in "${main_architectures[@]}" 'any'; do xbsrepo_from="$(xbs releasepath "${pkgbase}" "${repo_from}" "${pkgarch}")" if [ -r "${xbsrepo_from}/PKGBUILD" ]; then pkgnames=($(. "${xbsrepo_from}/PKGBUILD"; echo "${pkgname[@]}")) @@ -40,7 +40,7 @@ for pkgbase in "${args[@]:2}"; do fi if [ "${pkgarch}" == 'any' ]; then - tarches=("${native_architectures[@]}") + tarches=("${main_architectures[@]}") else tarches=("${pkgarch}") fi @@ -68,7 +68,7 @@ for pkgbase in "${args[@]:2}"; do xbsrepo_to="$(xbs releasepath "$pkgbase" "$repo_to" "$pkgarch")" if true; then # to add an indent level to make merging easier if [ "${pkgarch}" == 'any' ]; then - tarches=("${native_architectures[@]}") + tarches=("${main_architectures[@]}") else tarches=("${pkgarch}") fi @@ -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 "../../../${main_packages_pool}/${pkgfile}" "${ftppath_to}/${tarch}/" - if [ -f "${root_dir}/${main_packages_pool}/${pkgfile}.sig" ]; then - ln -s "../../../${main_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}/${main_packages_pool}/${pkgfile} " + add_pkgs[${tarch}]+="${root_dir}/${native_packages_pool}/${pkgfile} " remove_pkgs[${tarch}]+="${pkgname} " done done @@ -93,14 +93,14 @@ for pkgbase in "${args[@]:2}"; do done done -for tarch in "${native_architectures[@]}"; do +for tarch in "${main_architectures[@]}"; do if [ -n "${add_pkgs[${tarch}]}" ]; then arch_repo_add "${repo_to}" "${tarch}" ${add_pkgs[${tarch}]} arch_repo_remove "${repo_from}" "${tarch}" ${remove_pkgs[${tarch}]} fi done -for pkgarch in "${native_architectures[@]}"; do +for pkgarch in "${main_architectures[@]}"; do repo_unlock "${repo_from}" "${pkgarch}" repo_unlock "${repo_to}" "${pkgarch}" done diff --git a/db-remove b/db-remove index a4adc23..ab4e097 100755 --- a/db-remove +++ b/db-remove @@ -17,7 +17,7 @@ if ! check_repo_permission "$repo"; then fi if [ "$arch" == "any" ]; then - tarches=("${native_architectures[@]}") + tarches=("${main_architectures[@]}") else tarches=("$arch") fi diff --git a/db-repo-add b/db-repo-add index 41dd84a..4b683cc 100755 --- a/db-repo-add +++ b/db-repo-add @@ -19,7 +19,7 @@ if ! check_repo_permission "$repo"; then fi if [ "$arch" == "any" ]; then - tarches=("${native_architectures[@]}") + tarches=("${main_architectures[@]}") else tarches=("$arch") fi diff --git a/db-repo-remove b/db-repo-remove index c0bd088..9e56c30 100755 --- a/db-repo-remove +++ b/db-repo-remove @@ -19,7 +19,7 @@ if ! check_repo_permission "$repo"; then fi if [ "$arch" == "any" ]; then - tarches=("${native_architectures[@]}") + tarches=("${main_architectures[@]}") else tarches=("$arch") fi diff --git a/db-sync b/db-sync index dd0603b..1bcc647 100755 --- a/db-sync +++ b/db-sync @@ -69,8 +69,8 @@ init() { get_repos # Traverse all repo-arch pairs - for _repo in "${derivative_native_repositories[@]}"; do - for _arch in "${native_architectures[@]}"; do + for _repo in "${derivative_main_repositories[@]}"; do + for _arch in "${main_architectures[@]}"; do msg "Processing %s-%s" "${_repo}-${_arch}" db_file=$(get_repo_file "${_repo}" "${_arch}")${database_extension_suffixfile} diff --git a/db-update b/db-update index 2066f27..5cc0ef1 100755 --- a/db-update +++ b/db-update @@ -16,14 +16,14 @@ fi repos=() for staging_repo in "${staging_repos[@]##*/}"; do - if in_array "${staging_repo}" "${native_repositories[@]}"; then + if in_array "${staging_repo}" "${main_repositories[@]}"; then repos+=("${staging_repo}") fi done -# TODO: this might lock too much (native_architectures) +# TODO: this might lock too much (main_architectures) for repo in "${repos[@]}"; do - for pkgarch in "${native_architectures[@]}"; do + for pkgarch in "${main_architectures[@]}"; do repo_lock "${repo}" "${pkgarch}" || exit 1 done done @@ -59,7 +59,7 @@ dirs=() for repo in "${repos[@]}"; do msg "Updating [%s]..." "${repo}" any_pkgs=($(getpkgfiles "${staging_directory}/${repo}/"*-any${package_extension_suffixfile} 2>/dev/null)) - for pkgarch in "${native_architectures[@]}"; do + for pkgarch in "${main_architectures[@]}"; do add_dirs=() add_pkgs=() arch_pkgs=($(getpkgfiles "${staging_directory}/${repo}/"*-"${pkgarch}"${package_extension_suffixfile} 2>/dev/null)) @@ -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}/${main_packages_pool}" + mv "${pkg}" "${root_dir}/${native_packages_pool}" fi - ln -s "../../../${main_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}/${main_packages_pool}" + mv "${pkg}.sig" "${root_dir}/${native_packages_pool}" fi - if [ -f "${root_dir}/${main_packages_pool}/${pkgfile}.sig" ]; then - ln -s "../../../${main_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}/$main_packages_pool/$pkgfile")/$repo/$(getpkgbase "${root_dir}/$main_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 @@ -93,7 +93,7 @@ for repo in "${repos[@]}"; do done for repo in "${repos[@]}"; do - for pkgarch in "${native_architectures[@]}"; do + for pkgarch in "${main_architectures[@]}"; do repo_unlock "${repo}" "${pkgarch}" done done diff --git a/etc/dbscripts.d/gnu+linux.cfg b/etc/dbscripts.d/gnu+linux.cfg index 3fc27ac..086ee89 100644 --- a/etc/dbscripts.d/gnu+linux.cfg +++ b/etc/dbscripts.d/gnu+linux.cfg @@ -1,30 +1,30 @@ #!/hint/bash # Main repositories -main_multilib_repositories=('multilib' 'multilib-testing' +native_multilib_repositories=('multilib' 'multilib-testing' 'pcr-multilib') -main_native_repositories=('nonprism' 'nonprism-testing' +native_main_repositories=('nonprism' 'nonprism-testing' 'nonsystemd' 'nonsystemd-testing' 'core' 'extra' 'testing' 'kernels' 'cross' 'java' 'pcr' '~aurelien' '~brendan' '~coadde' '~drtan' '~emulatorman' '~jorginho' '~lukeshu' '~smv' '~xihh') # Derivative repositories derivative_multilib_repositories=() -derivative_native_repositories=() +derivative_main_repositories=() # Remote repositories -multilib_repositories=("${main_multilib_repositories[@]}" "${derivative_multilib_repositories[@]}") -native_repositories=("${main_native_repositories[@]}" "${derivative_native_repositories[@]}") +multilib_repositories=("${native_multilib_repositories[@]}" "${derivative_multilib_repositories[@]}") +main_repositories=("${native_main_repositories[@]}" "${derivative_main_repositories[@]}") # Directories where packages are shared between repos # *relative to root_dir* -main_packages_pool='pools/parabola_gnu+linux-libre' +native_packages_pool='pools/parabola_gnu+linux-libre' derivative_packages_pools=() # Directories where sources are stored -main_sources_pool='sources/parabola_gnu+linux-libre' +native_sources_pool='sources/parabola_gnu+linux-libre' derivative_sources_pools=() multilib_architectures=() -native_architectures=('mips64el') +main_architectures=('mips64el') # sync for derivative distribution (db-sync) sync_domain= diff --git a/etc/dbscripts.d/gnu+linux_arm_arch_legacy.cfg b/etc/dbscripts.d/gnu+linux_arm_arch_legacy.cfg index 491c9e0..2c4a95d 100644 --- a/etc/dbscripts.d/gnu+linux_arm_arch_legacy.cfg +++ b/etc/dbscripts.d/gnu+linux_arm_arch_legacy.cfg @@ -1,30 +1,30 @@ #!/hint/bash # Main repositories -main_multilib_repositories=('libre-multilib' 'libre-multilib-testing' +native_multilib_repositories=('libre-multilib' 'libre-multilib-testing' 'pcr-multilib') -main_native_repositories=('nonprism' 'nonprism-testing' +native_main_repositories=('nonprism' 'nonprism-testing' 'nonsystemd' 'nonsystemd-testing' 'libre' 'libre-testing' 'kernels' 'cross' 'java' 'pcr' '~aurelien' '~brendan' '~coadde' '~drtan' '~emulatorman' '~jorginho' '~lukeshu' '~smv' '~xihh') # Derivative repositories from Arch arm derivative_multilib_repositories=() -derivative_native_repositories=('core' 'extra' 'community' 'aur' 'alarm') +derivative_main_repositories=('core' 'extra' 'community' 'aur' 'alarm') # Remote repositories -multilib_repositories=("${main_multilib_repositories[@]}" "${derivative_multilib_repositories[@]}") -native_repositories=("${main_native_repositories[@]}" "${derivative_native_repositories[@]}") +multilib_repositories=("${native_multilib_repositories[@]}" "${derivative_multilib_repositories[@]}") +main_repositories=("${native_main_repositories[@]}" "${derivative_main_repositories[@]}") # Directories where packages are shared between repos # *relative to root_dir* -main_packages_pool='pool/parabola' +native_packages_pool='pool/parabola' derivative_packages_pools=('pool/arch_gnu+linux-arm') # Directories where sources are stored -main_sources_pool='sources/parabola' +native_sources_pool='sources/parabola' derivative_sources_pools=('sources/arch_gnu+linux-arm') multilib_architectures=() -native_architectures=('arm' 'armv6h' 'armv7h' 'aarch64') +main_architectures=('arm' 'armv6h' 'armv7h' 'aarch64') # sync for derivative distribution (db-sync) sync_domain="ftp.halifax.rwth-aachen.de" diff --git a/etc/dbscripts.d/gnu+linux_x86_arch_legacy.cfg b/etc/dbscripts.d/gnu+linux_x86_arch_legacy.cfg index b9dd46e..d89ace8 100644 --- a/etc/dbscripts.d/gnu+linux_x86_arch_legacy.cfg +++ b/etc/dbscripts.d/gnu+linux_x86_arch_legacy.cfg @@ -1,32 +1,32 @@ #!/hint/bash # Main repositories -main_multilib_repositories=('libre-multilib' 'libre-multilib-testing' +native_multilib_repositories=('libre-multilib' 'libre-multilib-testing' 'pcr-multilib') -main_native_repositories=('nonprism' 'nonprism-testing' +native_main_repositories=('nonprism' 'nonprism-testing' 'nonsystemd' 'nonsystemd-testing' 'libre' 'libre-testing' 'kernels' 'cross' 'java' 'pcr' '~aurelien' '~brendan' '~coadde' '~drtan' '~emulatorman' '~jorginho' '~lukeshu' '~smv' '~xihh' - "${main_multilib_repositories[@]}") # legacy (multilib only) + "${native_multilib_repositories[@]}") # legacy (multilib only) # Derivative repositories from Arch x86 derivative_multilib_repositories=('multilib' 'multilib-testing') -derivative_native_repositories=('core' 'extra' 'testing' 'community' +derivative_main_repositories=('core' 'extra' 'testing' 'community' "${derivative_multilib_repositories[@]}") # legacy (multilib only) # Remote repositories -multilib_repositories=("${main_multilib_repositories[@]}" "${derivative_multilib_repositories[@]}") -native_repositories=("${main_native_repositories[@]}" "${derivative_native_repositories[@]}") +multilib_repositories=("${native_multilib_repositories[@]}" "${derivative_multilib_repositories[@]}") +main_repositories=("${native_main_repositories[@]}" "${derivative_main_repositories[@]}") # Directories where packages are shared between repos # *relative to root_dir* -main_packages_pool='pool/parabola' +native_packages_pool='pool/parabola' derivative_packages_pools=(pool/{packages,community}) # Directories where sources are stored -main_sources_pool='sources/parabola' +native_sources_pool='sources/parabola' derivative_sources_pools=(sources/{packages,community}) multilib_architectures=('x86_64') -native_architectures=('i686' +main_architectures=('i686' "${multilib_architectures[@]}") # legacy (multilib only) # sync for derivative distribution (db-sync) diff --git a/mkrepo b/mkrepo index 06708b9..905e1c7 100755 --- a/mkrepo +++ b/mkrepo @@ -7,7 +7,7 @@ source "$(dirname "$(readlink -e "$0")")/etc/dbscripts.cfg" for repo in "$@"; do echo ":: Creating [$repo]" - for arch in "${native_architectures[@]}"; do + for arch in "${main_architectures[@]}"; do mkdir -pv "${root_dir}/${repo}/os/${arch}" done done diff --git a/share/db-functions b/share/db-functions index 6e628e2..0c82daa 100644 --- a/share/db-functions +++ b/share/db-functions @@ -338,7 +338,7 @@ check_pkgfile() { local pkgarch="$(getpkgarch "${pkgfile}")" [ $? -ge 1 ] && return 1 - in_array "${pkgarch}" "${native_architectures[@]}" 'any' || return 1 + in_array "${pkgarch}" "${main_architectures[@]}" 'any' || return 1 if echo "${pkgfile##*/}" | grep -q "${pkgname}-${pkgver}-${pkgarch}"; then return 0 @@ -359,7 +359,7 @@ check_pkgxbs() { [ $? -ge 1 ] && return 1 local repo="${2}" - in_array "${repo}" "${native_repositories[@]}" || return 1 + in_array "${repo}" "${main_repositories[@]}" || return 1 local xbsver="$(. "$(xbs releasepath "${_pkgbase}" "${repo}" "${_pkgarch}")/PKGBUILD"; get_full_version "${_pkgname}")" [ "${xbsver}" == "${_pkgver}" ] || return 1 @@ -417,15 +417,15 @@ check_pkgrepos() { local pkgarch="$(getpkgarch "${pkgfile}")" [ $? -ge 1 ] && return 1 - [ -f "${root_dir}/${main_packages_pool}/${pkgname}-${pkgver}-${pkgarch}"${package_extension_suffixfile} ] && return 1 - [ -f "${root_dir}/${main_packages_pool}/${pkgname}-${pkgver}-${pkgarch}"${package_extension_suffixfile}.sig ] && return 1 - [ -f "${root_dir}/${main_packages_pool}/${pkgfile##*/}" ] && return 1 - [ -f "${root_dir}/${main_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 - for repo in "${native_repositories[@]}"; do - for arch in "${native_architectures[@]}"; do + for repo in "${main_repositories[@]}"; do + for arch in "${main_architectures[@]}"; do [ -f "${root_dir}/${repo}/os/${arch}/${pkgname}-${pkgver}-${pkgarch}"${package_extension_suffixfile} ] && return 1 [ -f "${root_dir}/${repo}/os/${arch}/${pkgname}-${pkgver}-${pkgarch}"${package_extension_suffixfile}.sig ] && return 1 [ -f "${root_dir}/${repo}/os/${arch}/${pkgfile##*/}" ] && return 1 @@ -449,15 +449,15 @@ chk_license() { check_repo_permission() { local repo=$1 - [ ${#native_repositories[@]} -eq 0 ] && return 1 - [ -z "${main_packages_pool}" ] && return 1 + [ ${#main_repositories[@]} -eq 0 ] && return 1 + [ -z "${native_packages_pool}" ] && return 1 - in_array "${repo}" "${native_repositories[@]}" || return 1 + in_array "${repo}" "${main_repositories[@]}" || return 1 - [ -w "${root_dir}/${main_packages_pool}" ] || return 1 + [ -w "${root_dir}/${native_packages_pool}" ] || return 1 local arch - for arch in "${native_architectures[@]}"; do + for arch in "${main_architectures[@]}"; do local dir="${root_dir}/${repo}/os/${arch}/" [ -w "${dir}" ] || return 1 [ -f "${dir}${repo}"${database_extension_suffixfile} -a ! -w "${dir}${repo}"${database_extension_suffixfile} ] && return 1 diff --git a/test/lib/common.inc b/test/lib/common.inc index dbfe988..846dfba 100644 --- a/test/lib/common.inc +++ b/test/lib/common.inc @@ -59,18 +59,18 @@ setUp() { temporary_directory="$(mktemp -d /dev/shm/$(basename $0).XXXXXXXXXX)" #msg "Using ${temporary_directory}" - native_repositories=('core' 'extra' 'testing') - main_packages_pool='pool/packages' + main_repositories=('core' 'extra' 'testing') + native_packages_pool='pool/packages' mkdir -p "${temporary_directory}/"{ftp,tmp,staging,{package,source}-cleanup,svn-packages-{copy,repo}} - for r in ${native_repositories[@]}; do + for r in ${main_repositories[@]}; do mkdir -p "${temporary_directory}/staging/${r}" - for a in ${native_architectures[@]} any; do + for a in ${main_architectures[@]} any; do mkdir -p "${temporary_directory}/ftp/${r}/os/${a}" done done - mkdir -p "${temporary_directory}/ftp/${main_packages_pool}" - mkdir -p "${temporary_directory}/ftp/${main_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" @@ -87,8 +87,8 @@ setUp() { cat < "$(dirname ${BASH_SOURCE[0]})/../../etc/dbscripts.local.cfg" root_dir="${temporary_directory}/ftp" SVN_repository="file://${temporary_directory}/svn-packages-repo" - native_repositories=(${native_repositories[@]}) - main_packages_pool="${main_packages_pool}" + main_repositories=(${main_repositories[@]}) + 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}/${main_packages_pool}/${pkg}" ] || fail "${main_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}/${main_packages_pool}/${pkg}.sig" ] || fail "${main_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}/${main_packages_pool}/${pkg}" ] \ - || fail "${repo}/os/${arch}/${pkg} does not link to ${main_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}/${main_packages_pool}/${pkg}.sig" ] \ - || fail "${repo}/os/${arch}/${pkg}.sig does not link to ${main_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}/${main_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}/${main_packages_pool}/${pkg}" ] || fail "${main_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}/${main_packages_pool}/${pkg}" ] \ - || fail "${repo}/os/${arch}/${pkg} does not link to ${main_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}/${main_packages_pool}/${pkg}.sig" ] || fail "${main_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}/${main_packages_pool}/${pkg}.sig" ] \ - || fail "${repo}/os/${arch}/${pkg}.sig does not link to ${main_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}/${main_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 2b76fad..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}/${main_packages_pool}/" - touch "${root_dir}/${main_packages_pool}/${pkgbase}-1-1-${arch}.pkg.tar.xz.sig" - ln -s "${root_dir}/${main_packages_pool}/${pkgbase}-1-1-${arch}.pkg.tar.xz" "${root_dir}/extra/os/${arch}/" - ln -s "${root_dir}/${main_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}/${main_packages_pool}/" - touch "${root_dir}/${main_packages_pool}/${pkgbase}-1-1-${arch}.pkg.tar.xz.sig" - ln -s "${root_dir}/${main_packages_pool}/${pkgbase}-1-1-${arch}.pkg.tar.xz" "${root_dir}/extra/os/${arch}/" - ln -s "${root_dir}/${main_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 bce2669..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}/${main_packages_pool}/${pkg1}" ] && fail "${main_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}/${main_packages_pool}/${pkg1}" ] && fail "${main_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}/${main_packages_pool}/${pkg1}" ] && fail "${main_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}/${main_packages_pool}/${pkg}" ] && fail "${main_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 ff5b3ea..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}/${main_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}/${main_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}/${main_packages_pool}/${pkg1}" ] && fail "${main_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}/${main_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}/${main_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 486e0be..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}/${main_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}/${main_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}/${main_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}/${main_sources_pool}/pkg-simple-a-*${source_extension_suffixfile} ] && fail "source package was not removed!" - [ ! -r ${root_dir}/${main_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" -- cgit v1.2.3