do not address deletion-list directly, but rather by its stability "forbidden"

1 files changed, 17 insertions, 8 deletions

diff --git a/bin/delete-packages b/bin/delete-packages
index 58d15e3..5109e4c 100755
--- a/bin/delete-packages
+++ b/bin/delete-packages
@@ -363,11 +363,26 @@ fi
   printf 'LOAD DATA LOCAL INFILE "%s" INTO TABLE `bpir_to_delete`;\n' \
     "${tmp_dir}/package-in-repository-ids"
 
+  printf 'UPDATE `binary_packages_in_repositories`'
+  printf ' JOIN `bpir_to_delete`'
+  printf ' ON `bpir_to_delete`.`id`=`binary_packages_in_repositories`.`id`'
+  mysql_join_binary_packages_in_repositories_repositories
+  printf ' JOIN `repositories` AS `d_r`'
+  printf ' ON `d_r`.`stability`=%s' \
+    "${repository_stability_ids__forbidden}"
+  printf ' AND `d_r`.`architecture`=`repositories`.`architecture`'
+  printf ' SET `binary_packages_in_repositories`.`repository`=`d_r`.`id`'
+  # shellcheck disable=SC2154
+  printf ' WHERE `repositories`.`stability`!=%s;\n' \
+    "${repository_stability_ids__standalone}"
+
   printf 'DELETE `binary_packages_in_repositories`'
   printf ' FROM `binary_packages_in_repositories`'
-  printf ' JOIN `bpir_to_delete` ON `bpir_to_delete`.`id`=`binary_packages_in_repositories`.`id`'
+  printf ' JOIN `bpir_to_delete`'
+  printf ' ON `bpir_to_delete`.`id`=`binary_packages_in_repositories`.`id`'
   mysql_join_binary_packages_in_repositories_repositories
-  printf ' WHERE `repositories`.`name`="build-support";\n'
+  printf ' WHERE `repositories`.`stability`!=%s;\n' \
+    "${repository_stability_ids__forbidden}"
 
   printf 'DELETE `binary_packages`'
   printf ' FROM `binary_packages`'
@@ -375,12 +390,6 @@ fi
     printf 'SELECT 1 FROM `binary_packages_in_repositories`'
     printf ' WHERE `binary_packages_in_repositories`.`package`=`binary_packages`.`id`'
   printf ');\n'
-
-  printf 'UPDATE `binary_packages_in_repositories`'
-  printf ' JOIN `bpir_to_delete` ON `bpir_to_delete`.`id`=`binary_packages_in_repositories`.`id`'
-  # shellcheck disable=SC2154
-  printf ' SET `binary_packages_in_repositories`.`repository`=%s;\n' \
-    "${repository_ids__any_deletion_list}"
 } | \
   mysql_run_query