summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-06-18 12:38:09 +0200
committerErich Eckner <git@eckner.net>2018-06-18 12:38:09 +0200
commit200bbad6090d54a10b0ce9ec7c0e658d63b5eb25 (patch)
tree7e09359b34e189a3d0ba91b3ece78fb449bd0f4c
parent6a08e2e97d13e25f22d3447496906497e5c337d5 (diff)
downloadbuilder-200bbad6090d54a10b0ce9ec7c0e658d63b5eb25.tar.xz
lib/mysql-functions: blocking dependencies need to be relevant_for_building
-rwxr-xr-xlib/mysql-functions8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/mysql-functions b/lib/mysql-functions
index 206a06a..f7b6b77 100755
--- a/lib/mysql-functions
+++ b/lib/mysql-functions
@@ -899,14 +899,16 @@ mysql_query_has_pending_dependencies() {
printf 'EXISTS ('
printf 'SELECT 1 FROM `binary_packages_in_repositories` as `todos_bpir`'
mysql_join_binary_packages_in_repositories_binary_packages 'todos_bpir' 'todos'
- mysql_join_binary_packages_dependencies 'todos'
- mysql_join_dependencies_install_target_providers
- mysql_join_install_target_providers_binary_packages '' 'deps'
+ mysql_join_binary_packages_dependencies 'todos' 'l_deps'
+ mysql_join_dependencies_dependency_types 'l_deps' 'l_dep_ts'
+ mysql_join_dependencies_install_target_providers 'l_deps' 'l_itps'
+ mysql_join_install_target_providers_binary_packages 'l_itps' 'deps'
mysql_join_binary_packages_binary_packages_in_repositories 'deps' 'deps_bpir'
printf ' WHERE'
printf ' `%s`.`repository`=%s AND' \
'deps_bpir' "${repository_ids__any_build_list}" \
'todos_bpir' "${repository_ids__any_build_list}"
+ printf ' `l_dep_ts`.`relevant_for_building` AND '
printf ' `deps`.`build_assignment`!=`todos`.`build_assignment` AND'
printf ' `todos`.`build_assignment`=%s' \
"$1"