bin/seed-build-list: if a to-be-seeded package is not found in community64, look in packages64 or vice versa

1 files changed, 15 insertions, 6 deletions

diff --git a/bin/seed-build-list b/bin/seed-build-list
index 840ad01..b0061cb 100755
--- a/bin/seed-build-list
+++ b/bin/seed-build-list
@@ -7,9 +7,6 @@
 
 # TODO: allow to filter by architecture
 
-# TODO: if a to-be-seeded package is not found in community64, look in
-# packages64 or vice versa
-
 # shellcheck disable=SC2016
 usage() {
   >&2 echo ''
@@ -570,9 +567,21 @@ fi
 
 if ${update}; then
   while read -r pkgbase git_rev mod_git_rev repo; do
-    printf '%s ' "${pkgbase}" "${git_rev}" "${mod_git_rev}" "${repo}" | \
-      sed 's/ $/\n/'
-    if ! mysql_generate_package_metadata "${repository_ids__any_build_list}" "${pkgbase}" "${git_rev}" "${mod_git_rev}" "${repo}" && \
+    success=false
+    # shellcheck disable=SC2154
+    for gr_r in \
+      "${git_rev}:${repo}" \
+      "${repo_heads__packages}:core" \
+      "${repo_heads__packages}:extra" \
+      "${repo_heads__community}:community"; do
+      printf '%s ' "${pkgbase}" "${gr_r%:*}" "${mod_git_rev}" "${gr_r#*:}" | \
+        sed 's/ $/\n/'
+      if mysql_generate_package_metadata "${repository_ids__any_build_list}" "${pkgbase}" "${gr_r%:*}" "${mod_git_rev}" "${gr_r#*:}"; then
+        success=true
+        break
+      fi
+    done
+    if ! ${success} && \
       ! ${ignore_mysql_generate_package_metadata_errors}; then
       exit 2
     fi