summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-09-17 22:11:28 +0200
committerErich Eckner <git@eckner.net>2018-09-17 22:11:28 +0200
commit7ff13e834be11f675c5b62ae92ebd857a2c245d4 (patch)
treea213d503be1c47098dfc21083ea089332031f52d /lib
parentc5c27eb501669a4da182dfb684a5bf266902f7ea (diff)
downloadbuilder-7ff13e834be11f675c5b62ae92ebd857a2c245d4.tar.xz
lib/mysql-functions: mysql_query_has_pending_dependencies() should ignore dependencies which have identical build_assignments
Diffstat (limited to 'lib')
-rwxr-xr-xlib/mysql-functions9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/mysql-functions b/lib/mysql-functions
index dd17fde..aba6ce6 100755
--- a/lib/mysql-functions
+++ b/lib/mysql-functions
@@ -939,6 +939,8 @@ mysql_query_has_pending_dependencies() {
printf ' ON `architecture_compatibilities`.`built_for`=`dep_bp`.`architecture`'
printf ' AND `architecture_compatibilities`.`fully_compatible`'
printf ' WHERE `l_itps`.`install_target`=`l_deps`.`depending_on`'
+ printf ' AND `dep_bp`.`build_assignment`!=%s' \
+ "$2"
printf ' AND `architecture_compatibilities`.`runs_on`=%s' \
"$1"
# version is irelevant: either the package is built and we don't
@@ -953,9 +955,12 @@ mysql_query_has_pending_dependencies() {
mysql_join_install_target_providers_binary_packages 'l_itps' 'dep_bp'
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' \
+ printf ' AND ('
+ printf '`dep_r`.`is_on_master_mirror`'
+ printf ' OR `dep_bp`.`build_assignment`=%s' \
+ "$2"
+ printf ') AND `dep_r`.`architecture`=%s' \
"$1"
printf ' AND '
mysql_query_ordering_correct \