From ab53d40da0070cff1f1d3bbae8664918a90076b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?=
 <coadde@parabola.nu>
Date: Thu, 24 Sep 2015 00:26:02 -0300
Subject: remane main -> native (if not derivation) and native -> main (if not
 multilib)

---
 db-move | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'db-move')

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
-- 
cgit v1.2.3-2-g168b