diff options
| author | P. J. McDermott <pjm@nac.net> | 2013-08-14 12:15:19 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pjm@nac.net> | 2013-08-14 12:15:19 (EDT) |
| commit | 434cddbfbc94ea5690a5a1f381e94c60b307c397 (patch) | |
| tree | 50ee443b6032500dcc612d5ace5b73db336eb91d | |
| parent | d44ba3fdd61ccedc00033e47c4d4eea117002fc4 (diff) | |
db_*_package*(): Reverse arch and plat.
| -rw-r--r-- | lib/db.sh | 12 | ||||
| -rw-r--r-- | lib/include.sh | 2 | ||||
| -rw-r--r-- | lib/remove.sh | 4 | ||||
| -rw-r--r-- | lib/suite.sh | 2 |
4 files changed, 10 insertions, 10 deletions
@@ -185,8 +185,8 @@ db_get_archplats() db_get_packages() { - local plat="${1}" - local arch="${2}" + local arch="${1}" + local plat="${2}" local source="${3}" local binver="${4}" local dir= @@ -202,8 +202,8 @@ db_get_packages() db_add_package() { - local plat="${1}" - local arch="${2}" + local arch="${1}" + local plat="${2}" local source="${3}" local binver="${4}" local size="${5}" @@ -221,8 +221,8 @@ db_add_package() db_del_packages() { - 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 662f1ab..0a1fa77 100644 --- a/lib/include.sh +++ b/lib/include.sh @@ -110,7 +110,7 @@ include_changes() IFS='_' read -r pkg binver arch plat <<-EOF ${file%.opk} EOF - db_add_package "${plat}" "${arch}" "${source}" "${binver}" \ + db_add_package "${arch}" "${plat}" "${source}" "${binver}" \ "${size}" "${sect}" "${pkg}" pool_file="pool/$(hash_name "${source}")/${source}" pool_file="${pool_file}/${pkg}_${binver}_${arch}_${plat}.opk" diff --git a/lib/remove.sh b/lib/remove.sh index 79428f0..c268d8a 100644 --- a/lib/remove.sh +++ b/lib/remove.sh @@ -70,11 +70,11 @@ remove_packages_from_suite_archplat() mark_pool_garbage "${file}" fi done <<-EOF - $(db_get_packages "${plat}" "${arch}" "${source}" "${binver}") + $(db_get_packages "${arch}" "${plat}" "${source}" "${binver}") EOF if [ ${refs} -eq 0 ]; then - db_del_packages "${plat}" "${arch}" "${source}" "${binver}" + db_del_packages "${arch}" "${plat}" "${source}" "${binver}" fi return 0 diff --git a/lib/suite.sh b/lib/suite.sh index 709c3e6..1444b48 100644 --- a/lib/suite.sh +++ b/lib/suite.sh @@ -76,7 +76,7 @@ _suite_copy_source() "${plat}" "${arch}" \ "${sect}" "${pkg}" "${size}" "${pool_file}" done <<-EOF - $(db_get_packages "${plat}" "${arch}" \ + $(db_get_packages "${arch}" "${plat}" \ "${source}" "${binver}") EOF done <<-EOF |