From 8a9406336f7a2e03137d5a443a4de62dff02b9f0 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Fri, 14 Sep 2018 16:10:35 +0200 Subject: bin/seed-build-list: cleanup --- bin/seed-build-list | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/bin/seed-build-list b/bin/seed-build-list index 81b0054..23cbab0 100755 --- a/bin/seed-build-list +++ b/bin/seed-build-list @@ -5,9 +5,6 @@ # shellcheck source=../lib/load-configuration . "${0%/*}/../lib/load-configuration" -# TODO: (re-)scheduled packages should be deleted from the -# deletion-list - # TODO: allow to filter by architecture # shellcheck disable=SC2016 @@ -592,11 +589,10 @@ if ${update}; then printf ' ON `pkgbases`.`pkgbase`=`a_ps`.`pkgbase`' mysql_join_package_sources_build_assignments 'a_ps' 'a_ba' mysql_join_build_assignments_binary_packages 'a_ba' 'a_bp' - mysql_join_binary_packages_architectures 'a_bp' 'a_bpa' - printf ' AND (' - printf '`a_bpa`.`name`="any"' - printf ' OR `a_bpa`.`id`=`d_r`.`architecture`' - printf ')' + printf ' JOIN `architecture_compatibilities` AS `ac`' + printf ' ON `ac`.`built_for`=`a_bp`.`architecture`' + printf ' AND `ac`.`runs_on`=`d_r`.`architecture`' + printf ' AND `ac`.`fully_compatible`' mysql_join_binary_packages_binary_packages_in_repositories 'a_bp' 'a_bpir' printf ' AND `a_bpir`.`repository`=%s;\n' \ "${repository_ids__any_build_list}" -- cgit v1.2.3