summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-10-23 13:09:46 +0200
committerErich Eckner <git@eckner.net>2018-10-23 13:09:46 +0200
commitd6eb55cf248c13d4acb9563d2e770e7b3c8c7c7a (patch)
treef1b7c9892001fdb998b3ac898867b1640de02b3f
parent795dd0db9848020c4d60b4f3eaaf9c2d7b82e4a8 (diff)
downloadbuilder-d6eb55cf248c13d4acb9563d2e770e7b3c8c7c7a.tar.xz
bin/prioritize-build-list: fix bugs and only consider run-time dependencies
-rwxr-xr-xbin/prioritize-build-list20
1 files 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`'