summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-11-21 11:12:02 +0100
committerErich Eckner <git@eckner.net>2019-11-21 11:12:02 +0100
commit18a933d29575cb6e8cd5786b764cc6b77bb2e8bb (patch)
treee7a1a731d2a1bc0064a1a2b8bbdf94d6446321db /bin
parenta4b3b3aac5411dc60f679c7d0fe2060bba2a2e5c (diff)
downloadbuilder-18a933d29575cb6e8cd5786b764cc6b77bb2e8bb.tar.xz
bin/bootstrap-mysql: calculate_maximal_moveable_set(): check version for moved packages, too - TODO is done
Diffstat (limited to 'bin')
-rwxr-xr-xbin/bootstrap-mysql4
1 files changed, 3 insertions, 1 deletions
diff --git a/bin/bootstrap-mysql b/bin/bootstrap-mysql
index 30261c6..5e43e9c 100755
--- a/bin/bootstrap-mysql
+++ b/bin/bootstrap-mysql
@@ -200,7 +200,6 @@ fi
printf ' ON `binary_packages_in_repositories`.`id`=`moveable_bpir`.`id`'
printf ' JOIN `repositories` AS `target_repositories`'
printf ' ON `moveable_bpir`.`to_repository`=`target_repositories`.`id`'
-# TODO: version must be checked, too!
mysql_join_binary_packages_in_repositories_binary_packages
mysql_join_binary_packages_dependencies
mysql_join_dependencies_dependency_types
@@ -233,10 +232,13 @@ fi
printf ') AND NOT EXISTS ('
printf 'SELECT 1'
printf ' FROM `install_target_providers`'
+ mysql_join_install_target_providers_versions '' 'prov_v'
mysql_join_install_target_providers_binary_packages_in_repositories '' 'itp_bpir'
printf ' JOIN `moveable_bpir_copy`'
printf ' ON `moveable_bpir_copy`.`id`=`itp_bpir`.`id`'
printf ' WHERE `install_target_providers`.`install_target`=`dependencies`.`depending_on`'
+ printf ' AND '
+ mysql_query_ordering_correct '`versions`.`order`' '`prov_v`.`order`' '`dependencies`.`version_relation`'
printf ');\n'
printf 'SET row_count_saved = row_count_saved + ROW_COUNT();\n'