bin/create-build-support-package: some bug fixes

1 files changed, 6 insertions, 4 deletions

diff --git a/bin/create-build-support-package b/bin/create-build-support-package
index 1763b41..caf21f0 100755
--- a/bin/create-build-support-package
+++ b/bin/create-build-support-package
@@ -25,9 +25,9 @@ usage() {
 eval set -- "$(
   getopt -o a:hw \
     --long arch \
-    --long from \
+    --long from: \
     --long help \
-    --long shim \
+    --long shim: \
     --long wait \
     -n "$(basename "$0")" -- "$@" || \
     echo usage
@@ -79,6 +79,7 @@ while true; do
       exit 42
     ;;
   esac
+  shift
 done
 
 if [ -n "${source_package}" ] \
@@ -109,9 +110,10 @@ if [ -n "${source_package}" ]; then
       printf ' FROM `binary_packages`'
       mysql_join_binary_packages_binary_packages_in_repositories
       mysql_join_binary_packages_in_repositories_repositories
-      mysql_join_repositories_architectures
+      mysql_join_repositories_architectures '' 'r_a'
+      mysql_join_binary_packages_architectures
       printf ' WHERE `repositories`.`is_on_master_mirror`'
-      printf ' AND `architectures`.`name`=from_base64("%s")' \
+      printf ' AND `r_a`.`name`=from_base64("%s")' \
         "$(
           printf '%s' "${repo_arch}" \
             | base64 -w0