diff options
Diffstat (limited to 'db-update')
| -rwxr-xr-x | db-update | 22 |
1 files changed, 11 insertions, 11 deletions
@@ -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 |