summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-07-05 15:26:03 +0200
committerErich Eckner <git@eckner.net>2019-07-05 15:26:03 +0200
commit1cb1c3956b8c5de12340f5008ed815320cb4ab8a (patch)
tree236966d0e1aa3d85c3cebe17425d095a75452511 /lib
parent074c1894b3a581ef6a221909e6cda3137046ed61 (diff)
downloadbuilder-1cb1c3956b8c5de12340f5008ed815320cb4ab8a.tar.xz
lib/mysql-functions: mysql_query_has_pending_dependencies(): check for haskell on the install_target, not the depending binary_packages
Diffstat (limited to 'lib')
-rwxr-xr-xlib/mysql-functions4
1 files changed, 2 insertions, 2 deletions
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'