bin/modify-package-state: $pkgbse.$git_rev.$mod_git_rev.$repo.$arch for source operations

1 files changed, 6 insertions, 1 deletions

diff --git a/bin/modify-package-state b/bin/modify-package-state
index 25b70f2..686a131 100755
--- a/bin/modify-package-state
+++ b/bin/modify-package-state
@@ -175,6 +175,7 @@ while read -r a b; do
       # shellcheck disable=SC2016
       combiner=$(
         printf '`build_assignments`'
+        mysql_join_build_assignments_architectures
         mysql_join_build_assignments_package_sources
         mysql_join_package_sources_upstream_repositories
         mysql_join_build_assignments_binary_packages
@@ -184,8 +185,10 @@ while read -r a b; do
       )
       # shellcheck disable=SC2016
       selector=$(
-        repository="${a##*.}"
+        arch="${a##*.}"
         pkgbase="${a%.*}"
+        repository="${pkgbase##*.}"
+        pkgbase="${pkgbase%.*}"
         mod_git_revision="${pkgbase##*.}"
         pkgbase="${pkgbase%.*}"
         git_revision="${pkgbase##*.}"
@@ -193,6 +196,8 @@ while read -r a b; do
         printf 'WHERE `repository_stabilities`.`name`="unbuilt"'
         printf ' AND `upstream_repositories`.`name`=from_base64("%s")' \
           "$(printf '%s' "${repository}" | base64 -w0)"
+        printf ' AND `architectures`.`name`=from_base64("%s")' \
+          "$(printf '%s' "${arch}" | base64 -w0)"
         printf ' AND `package_sources`.`%s`=from_base64("%s")' \
           'pkgbase'          "$(printf '%s' "${pkgbase}" | base64 -w0)" \
           'git_revision'     "$(printf '%s' "${git_revision}" | base64 -w0)" \