bin/get-package-updates: repair marking-as-blacklisted

1 files changed, 11 insertions, 13 deletions

diff --git a/bin/get-package-updates b/bin/get-package-updates
index f77dee3..e240359 100755
--- a/bin/get-package-updates
+++ b/bin/get-package-updates
@@ -564,24 +564,22 @@ echo 'Done - mark decisions as final.'
       $ s/,$/;/
     '
   printf 'UPDATE `build_assignments`'
-  mysql_join_build_assignments_package_sources
+  printf ' SET `build_assignments`.`is_black_listed`=NULL;\n'
+  printf 'UPDATE `blacklist`'
+  printf ' JOIN `architectures`'
+  printf ' ON `architectures`.`name`=`blacklist`.`arch`'
+  printf ' JOIN `package_sources`'
+  printf ' ON `blacklist`.`pkgbase`=`package_sources`.`pkgbase`'
+  mysql_join_package_sources_build_assignments
   printf ' JOIN `architecture_compatibilities`'
   printf ' ON `build_assignments`.`architecture`=`architecture_compatibilities`.`built_for`'
-  printf ' LEFT JOIN ('
-    printf 'SELECT '
-    printf '`blacklist`.`pkgbase`,'
-    printf '`blacklist`.`reason`,'
-    printf '`architectures`.`id` AS `arch`'
-    printf ' FROM `blacklist`'
-    printf ' JOIN `architectures`'
-    printf ' ON `architectures`.`name`=`blacklist`.`arch`'
-  printf ') AS `bl` ON `package_sources`.`pkgbase`=`bl`.`pkgbase`'
   printf ' AND ('
-    printf '`architecture_compatibilities`.`runs_on`=`bl`.`arch`'
+    printf '`architectures`.`id`=`architecture_compatibilities`.`runs_on`'
     # shellcheck disable=SC2154
-    printf ' OR `bl`.`arch`=%s' \
+    printf ' OR `architectures`.`id`=%s' \
       "${architecture_ids__any}"
-  printf ') SET `build_assignments`.`is_black_listed`=`bl`.`reason`;\n'
+  printf ')'
+  printf ' SET `build_assignments`.`is_black_listed`=`blacklist`.`reason`;\n'
   printf 'DROP TEMPORARY TABLE `blacklist`;\n'
   printf 'COMMIT;\n'