Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2020-04-10 09:42:40 +0200
committerErich Eckner <git@eckner.net>2020-04-10 09:42:40 +0200
commit5635bd3322e542f678753db0cec51179c4fea42a (patch)
tree7615bdcd84206e1ad8a5bfa2fd4160d8e7a25eab /lib
parent8b67f33e0f643f21382e3d1523af1cad57d68d3a (diff)
lib/common-functions,lib/mysql-functions: do not treat makedepends of haskell-* differently
Diffstat (limited to 'lib')
-rwxr-xr-xlib/common-functions5
-rwxr-xr-xlib/mysql-functions14
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