summaryrefslogtreecommitdiff
path: root/db-move
diff options
context:
space:
mode:
Diffstat (limited to 'db-move')
-rwxr-xr-xdb-move20
1 files changed, 10 insertions, 10 deletions
diff --git a/db-move b/db-move
index 2714ff1..4c80d73 100755
--- a/db-move
+++ b/db-move
@@ -19,14 +19,14 @@ if ! check_repo_permission "$repo_to" || ! check_repo_permission "$repo_from"; t
fi
# TODO: this might lock too much (architectures)
-for pkgarch in "${ARCHES[@]}"; do
+for pkgarch in "${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 "${ARCHES[@]}" 'any'; do
+ for pkgarch in "${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=("${ARCHES[@]}")
+ tarches=("${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=("${ARCHES[@]}")
+ tarches=("${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 "../../../${PKGPOOL}/${pkgfile}" "${ftppath_to}/${tarch}/"
- if [ -f "${root_dir}/${PKGPOOL}/${pkgfile}.sig" ]; then
- ln -s "../../../${PKGPOOL}/${pkgfile}.sig" "${ftppath_to}/${tarch}/"
+ 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}/"
fi
- add_pkgs[${tarch}]+="${root_dir}/${PKGPOOL}/${pkgfile} "
+ add_pkgs[${tarch}]+="${root_dir}/${packages_pool}/${pkgfile} "
remove_pkgs[${tarch}]+="${pkgname} "
done
done
@@ -93,14 +93,14 @@ for pkgbase in "${args[@]:2}"; do
done
done
-for tarch in "${ARCHES[@]}"; do
+for tarch in "${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 "${ARCHES[@]}"; do
+for pkgarch in "${architectures[@]}"; do
repo_unlock "${repo_from}" "${pkgarch}"
repo_unlock "${repo_to}" "${pkgarch}"
done