diff options
| -rwxr-xr-x | lib/common-functions | 5 | ||||
| -rwxr-xr-x | lib/mysql-functions | 14 |
2 files changed, 3 insertions, 16 deletions
diff --git a/lib/common-functions b/lib/common-functions index 7bf7897..7cbf891 100755 --- a/lib/common-functions +++ b/lib/common-functions @@ -986,10 +986,7 @@ update_blocked_packages_count() { mysql_join_dependencies_dependency_types mysql_join_dependencies_install_target_providers_with_versions mysql_join_install_target_providers_binary_packages '' 'b_bp' - printf ' AND (' - printf '`dependency_types`.`relevant_for_binary_packages`' - printf ' OR `b_bp`.`pkgname` LIKE "haskell-%%"' - printf ')' + printf '`dependency_types`.`relevant_for_binary_packages`' mysql_join_binary_packages_binary_packages_in_repositories 'b_bp' 'b_bpir' printf ' AND `a_bpir`.`repository`=%s' \ "${repository_ids__any_build_list}" diff --git a/lib/mysql-functions b/lib/mysql-functions index b44a229..ae3612b 100755 --- a/lib/mysql-functions +++ b/lib/mysql-functions @@ -843,7 +843,6 @@ mysql_find_build_assignment_loops() { printf ' AND `dependency_types`.`relevant_for_building`' printf ' AND (' printf '`dependency_types`.`relevant_for_binary_packages`' - printf ' OR `nt_bp`.`pkgname` LIKE "haskell-%%"' printf ' OR NOT EXISTS (' printf 'SELECT 1' printf ' FROM `binary_packages_in_repositories` AS `subst_bpir`' @@ -1061,13 +1060,7 @@ mysql_query_has_pending_dependencies() { "$2" printf ' AND IF(' # ... and if (a) relevant for binary_packages ... - printf '`l_dep_ts`.`relevant_for_binary_packages`' - # (which includes makedependencies which are haskell packages ... - printf ' OR (' - printf '`install_targets`.`name` LIKE "haskell-%%"' - # ... but only if the package itself is not "ghc"!) - printf ' AND `todos`.`pkgname` NOT IN ("ghc","ghc-libs","ghc-static")' - printf '),' + printf '`l_dep_ts`.`relevant_for_binary_packages`,' # ... has some unbuilt provider ... printf 'EXISTS (' printf 'SELECT 1' @@ -1228,10 +1221,7 @@ mysql_query_generate_packages_with_pending_dependencies() { printf 'NOT `install_target_statuses`.`exists_built`' printf 'OR (' printf '`install_target_statuses`.`exists_unbuilt`' - printf ' AND (' - printf '`dependency_types`.`relevant_for_binary_packages`' - printf ' OR `install_targets`.`name` LIKE "haskell-%%"' - printf ')' + printf '`dependency_types`.`relevant_for_binary_packages`' printf ')' printf ')' mysql_join_dependencies_binary_packages |