From d6eb55cf248c13d4acb9563d2e770e7b3c8c7c7a Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Tue, 23 Oct 2018 13:09:46 +0200 Subject: bin/prioritize-build-list: fix bugs and only consider run-time dependencies --- bin/prioritize-build-list | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/bin/prioritize-build-list b/bin/prioritize-build-list index fa5ee5d..5e815bc 100755 --- a/bin/prioritize-build-list +++ b/bin/prioritize-build-list @@ -104,18 +104,20 @@ verbose_flock ${wait_for_lock} 8 printf 'SELECT' printf ' `s_ba`.`id`,' printf 'MAX(`g_ba`.`priority`) AS `priority`' - printf ' FROM `build_assignments` AS `s_ba`' - mysql_join_build_assignments_binary_packages 's_ba' 's_bp' - mysql_join_binary_packages_binary_packages_in_repositories 's_bp' 's_bpir' - printf ' AND `s_bpir`.`repository`=%s' \ - "${repository_ids__any_build_list}" - mysql_join_binary_packages_dependencies 's_bp' - mysql_join_dependencies_install_target_providers_with_versions - mysql_join_install_target_providers_binary_packages '' 'g_bp' + printf ' FROM `build_assignments` AS `g_ba`' + mysql_join_build_assignments_binary_packages 'g_ba' 'g_bp' mysql_join_binary_packages_binary_packages_in_repositories 'g_bp' 'g_bpir' printf ' AND `g_bpir`.`repository`=%s' \ "${repository_ids__any_build_list}" - mysql_join_binary_packages_build_assignments 'g_bp' 'g_ba' + mysql_join_binary_packages_dependencies 'g_bp' + mysql_join_dependencies_dependency_types + printf ' AND `dependency_types`.`relevant_for_binary_packages`' + mysql_join_dependencies_install_target_providers_with_versions + mysql_join_install_target_providers_binary_packages '' 's_bp' + mysql_join_binary_packages_binary_packages_in_repositories 's_bp' 's_bpir' + printf ' AND `s_bpir`.`repository`=%s' \ + "${repository_ids__any_build_list}" + mysql_join_binary_packages_build_assignments 's_bp' 's_ba' printf ' GROUP BY `s_ba`.`id`' printf ') AS `s_ba`' printf ' ON `s_ba`.`id`=`build_assignments`.`id`' -- cgit v1.2.3-54-g00ecf