From 18a933d29575cb6e8cd5786b764cc6b77bb2e8bb Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Thu, 21 Nov 2019 11:12:02 +0100 Subject: bin/bootstrap-mysql: calculate_maximal_moveable_set(): check version for moved packages, too - TODO is done --- bin/bootstrap-mysql | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'bin/bootstrap-mysql') 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' -- cgit v1.2.3-70-g09d2