From 16fdb76a1d6fe9da64682537245fa1343dbdbf9e Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Wed, 14 Aug 2013 12:24:25 -0400 Subject: db_*_references(): Reverse arch and plat. --- diff --git a/lib/db.sh b/lib/db.sh index 91e1a33..aef8248 100644 --- a/lib/db.sh +++ b/lib/db.sh @@ -240,8 +240,8 @@ db_del_packages() db_inc_references() { - local plat="${1}" - local arch="${2}" + local arch="${1}" + local plat="${2}" local source="${3}" local binver="${4}" local dir= @@ -264,8 +264,8 @@ db_inc_references() db_dec_references() { - local plat="${1}" - local arch="${2}" + local arch="${1}" + local plat="${2}" local source="${3}" local binver="${4}" local dir= diff --git a/lib/include.sh b/lib/include.sh index 0a1fa77..8b8aaaa 100644 --- a/lib/include.sh +++ b/lib/include.sh @@ -82,7 +82,7 @@ include_changes() fi db_set_binver "${chan}" "${dist}" "${arch}" "${plat}" \ "${source}" "${binver}" - db_inc_references "${plat}" "${arch}" "${source}" "${binver}" \ + db_inc_references "${arch}" "${plat}" "${source}" "${binver}" \ >/dev/null done <<-EOF ${bvaps} diff --git a/lib/remove.sh b/lib/remove.sh index c268d8a..f756a9d 100644 --- a/lib/remove.sh +++ b/lib/remove.sh @@ -59,7 +59,7 @@ remove_packages_from_suite_archplat() return 0 fi db_del_binver "${chan}" "${dist}" "${arch}" "${plat}" "${source}" - refs=$(db_dec_references "${plat}" "${arch}" "${source}" "${binver}") + refs=$(db_dec_references "${arch}" "${plat}" "${source}" "${binver}") while read -r size sect pkg; do feed_remove_package "${chan}" "${dist}" "${plat}" "${arch}" \ diff --git a/lib/suite.sh b/lib/suite.sh index 1444b48..e0e0b91 100644 --- a/lib/suite.sh +++ b/lib/suite.sh @@ -66,7 +66,7 @@ _suite_copy_source() "${arch}" "${plat}" "${source}")" db_set_binver "${dst_chan}" "${dst_dist}" "${arch}" "${plat}" \ "${source}" "${binver}" - db_inc_references "${plat}" "${arch}" "${source}" "${binver}" \ + db_inc_references "${arch}" "${plat}" "${source}" "${binver}" \ >/dev/null while read -r size sect pkg; do pool_file="pool/$(hash_name "${source}")/${source}" -- cgit v0.9.1