From 1cb1c3956b8c5de12340f5008ed815320cb4ab8a Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Fri, 5 Jul 2019 15:26:03 +0200 Subject: lib/mysql-functions: mysql_query_has_pending_dependencies(): check for haskell on the install_target, not the depending binary_packages --- lib/mysql-functions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/mysql-functions') diff --git a/lib/mysql-functions b/lib/mysql-functions index 8c71e53..685b346 100755 --- a/lib/mysql-functions +++ b/lib/mysql-functions @@ -1027,6 +1027,7 @@ mysql_query_has_pending_dependencies() { mysql_join_binary_packages_dependencies 'todos' 'l_deps' mysql_join_dependencies_versions 'l_deps' 'l_dep_vs' mysql_join_dependencies_dependency_types 'l_deps' 'l_dep_ts' + mysql_join_dependencies_install_targets 'd_deps' # ... is relevant for building ... printf ' AND `l_dep_ts`.`relevant_for_building`' printf ' WHERE `todos`.`build_assignment`=%s' \ @@ -1035,8 +1036,7 @@ mysql_query_has_pending_dependencies() { # ... and if (a) relevant for binary_packages ... printf '`l_dep_ts`.`relevant_for_binary_packages`' # (which includes makedependencies which are haskell packages!) -# TODO: wrong - this should test the install target provider! - printf ' OR `todos`.`pkgname` LIKE "haskell-%%",' + printf ' OR `install_targets`.`name` LIKE "haskell-%%",' # ... has some unbuilt provider ... printf 'EXISTS (' printf 'SELECT 1' -- cgit v1.2.3-54-g00ecf