From 36b0e9da28d78caf79f1fc5f8e39cb467aea3354 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Thu, 20 Feb 2020 15:05:59 +0100 Subject: bin/seed-build-list: delete deletion-list part of packages which are on the deletion-list and the build-list --- bin/seed-build-list | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'bin') diff --git a/bin/seed-build-list b/bin/seed-build-list index 2d840db..1d01545 100755 --- a/bin/seed-build-list +++ b/bin/seed-build-list @@ -725,12 +725,22 @@ if ${update}; then "${architecture_ids__any}" printf ');\n' -# TODO: We might now need to delete deletion-list packages which are now -# on the build-list, too. The questions are: -# Does that actually happen? Yes, it does! -# Why should that actually happen? Because we requested to reschedule them! -# Should we rather fix the other end (e.g. should these packages really -# be on the build-list)? Yes, if they were wrongly on the deletion-list! + # delete deletion-list part of packages which are on the + # deletion-list and the build-list + mysql_query_delete_packages \ + '1'"$( + printf ' JOIN `binary_packages` AS `j_bp`' + printf ' ON `j_bp`.`pkgname`=`binary_packages`.`pkgname`' + printf ' JOIN `architecture_compatibilities` AS `ac`' + printf ' ON `ac`.`fully_compatible`' + printf ' AND `ac`.`built_for`=`binary_packages`.`architecture`' + printf ' JOIN `architecture_compatibilities` AS `ac_j`' + printf ' ON `ac_j`.`fully_compatible`' + printf ' AND `ac_j`.`built_for`=`j_bp`.`architecture`' + printf ' AND `ac_j`.`runs_on`=`ac`.`runs_on`' + mysql_join_binary_packages_binary_packages_in_repositories 'j_bp' 'j_bpir' + )"' AND `j_bpir`.`id`='"${repository_ids__any_build_list}" \ + '`repositories`.`stability`='"${repository_stability_ids__forbidden}" } | \ mysql_run_query -- cgit v1.2.3-70-g09d2