summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-09-13 15:35:49 +0200
committerErich Eckner <git@eckner.net>2018-09-13 15:35:49 +0200
commit54b74c7b6913e4e92f25efdbd7e6bebcc8801689 (patch)
treea438a4cbe29d2ebb71aba0ecc38a7943289b27c3
parentb8fbd4f85572ba7d7bc565198c0d06200d52626c (diff)
downloadbuilder-54b74c7b6913e4e92f25efdbd7e6bebcc8801689.tar.xz
lib/mysql-functions: mysql_query_has_pending_dependencies(): do not use external stuff in internal JOIN...ONs
-rwxr-xr-xlib/mysql-functions6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/mysql-functions b/lib/mysql-functions
index 7cafb79..2c81b57 100755
--- a/lib/mysql-functions
+++ b/lib/mysql-functions
@@ -888,10 +888,10 @@ mysql_query_has_pending_dependencies() {
"${repository_ids__any_build_list}"
printf ' JOIN `architecture_compatibilities`'
printf ' ON `architecture_compatibilities`.`built_for`=`dep_bp`.`architecture`'
- printf ' AND `architecture_compatibilities`.`runs_on`=%s' \
- "$1"
printf ' AND `architecture_compatibilities`.`fully_compatible`'
printf ' WHERE `l_itps`.`install_target`=`l_deps`.`depending_on`'
+ printf ' AND `architecture_compatibilities`.`runs_on`=%s' \
+ "$1"
# version is irelevant: either the package is built and we don't
# care or the package is not built and we don't know
printf '),'
@@ -905,9 +905,9 @@ mysql_query_has_pending_dependencies() {
mysql_join_binary_packages_binary_packages_in_repositories 'dep_bp' 'dep_bpir'
mysql_join_binary_packages_in_repositories_repositories 'dep_bpir' 'dep_r'
printf ' AND `dep_r`.`is_on_master_mirror`'
+ printf ' WHERE `l_itps`.`install_target`=`l_deps`.`depending_on`'
printf ' AND `dep_r`.`architecture`=%s' \
"$1"
- printf ' WHERE `l_itps`.`install_target`=`l_deps`.`depending_on`'
printf ' AND '
mysql_query_ordering_correct \
'`l_dep_vs`.`order`' \