From 081396dc341061b9b88e1dd58e3107b85d79fb72 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Thu, 15 Aug 2013 11:37:59 -0400
Subject: feed_*_package(): Reverse arch and plat in args.

---
(limited to 'lib')

diff --git a/lib/include.sh b/lib/include.sh
index 282b14f..1bc999e 100644
--- a/lib/include.sh
+++ b/lib/include.sh
@@ -116,7 +116,7 @@ include_changes()
 		pool_file="${pool_file}/${pkg}_${binver}_${arch}_${plat}.opk"
 		cp -p "$(dirname "${changes}")/${file}" \
 			"${opt_base_dir}/${pool_file}"
-		feed_add_package "${chan}" "${dist}" "${plat}" "${arch}" \
+		feed_add_package "${chan}" "${dist}" "${arch}" "${plat}" \
 			"${sect}" "${pkg}" "${size}" "${pool_file}"
 	done <<-EOF
 		${_include_files}
diff --git a/lib/index.sh b/lib/index.sh
index 03746d2..5b6cdb9 100644
--- a/lib/index.sh
+++ b/lib/index.sh
@@ -23,8 +23,8 @@ feed_add_package()
 {
 	local chan="${1}"
 	local dist="${2}"
-	local plat="${3}"
-	local arch="${4}"
+	local arch="${3}"
+	local plat="${4}"
 	local sect="${5}"
 	local pkg="${6}"
 	local size="${7}"
@@ -59,8 +59,8 @@ feed_remove_package()
 {
 	local chan="${1}"
 	local dist="${2}"
-	local plat="${3}"
-	local arch="${4}"
+	local arch="${3}"
+	local plat="${4}"
 	local sect="${5}"
 	local pkg="${6}"
 	local pkg_hash=
diff --git a/lib/remove.sh b/lib/remove.sh
index c2e27e4..ce25ead 100644
--- a/lib/remove.sh
+++ b/lib/remove.sh
@@ -62,7 +62,7 @@ remove_packages_from_suite_archplat()
 	refs=$(db_dec_references "${arch}" "${plat}" "${source}" "${binver}")
 
 	while read -r size sect pkg; do
-		feed_remove_package "${chan}" "${dist}" "${plat}" "${arch}" \
+		feed_remove_package "${chan}" "${dist}" "${arch}" "${plat}" \
 			"${sect}" "${pkg}"
 		if [ ${refs} -eq 0 ]; then
 			file="pool/$(hash_name "${source}")/${source}"
diff --git a/lib/suite.sh b/lib/suite.sh
index 4115cea..1408c14 100644
--- a/lib/suite.sh
+++ b/lib/suite.sh
@@ -73,7 +73,7 @@ _suite_copy_source()
 			pool_file="${pool_file}/${pkg}_${binver}"
 			pool_file="${pool_file}_${arch}_${plat}.opk"
 			feed_add_package "${dst_chan}" "${dst_dist}" \
-				"${plat}" "${arch}" \
+				"${arch}" "${plat}" \
 				"${sect}" "${pkg}" "${size}" "${pool_file}"
 		done <<-EOF
 			$(db_get_packages "${arch}" "${plat}" \
--
cgit v0.9.1