bin/bootstrap-mysql: calculate_maximal_moveable_set(): check version for not-moved packages

1 files changed, 4 insertions, 1 deletions

diff --git a/bin/bootstrap-mysql b/bin/bootstrap-mysql
index 10b8cdb..30261c6 100755
--- a/bin/bootstrap-mysql
+++ b/bin/bootstrap-mysql
@@ -205,10 +205,12 @@ fi
   mysql_join_binary_packages_dependencies
   mysql_join_dependencies_dependency_types
   printf ' AND `dependency_types`.`relevant_for_binary_packages`'
+  mysql_join_dependencies_versions
   # ... by a not-deleted, "more stable" package already in place or ...
   printf ' WHERE 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 '' 'prov_bp'
     mysql_join_binary_packages_binary_packages_in_repositories 'prov_bp' 'prov_bpir'
     mysql_join_binary_packages_in_repositories_repositories 'prov_bpir' 'prov_r'
@@ -225,7 +227,8 @@ fi
       printf 'SELECT 1'
       printf ' FROM `replaced_bpir_copy`'
       printf ' WHERE `replaced_bpir_copy`.`id`=`prov_bpir`.`id`'
-    printf ')'
+    printf ') AND'
+    mysql_query_ordering_correct '`versions`.`order`' '`prov_v`.`order`' '`dependencies`.`version_relation`'
   # ... by a moved package
   printf ') AND NOT EXISTS ('
     printf 'SELECT 1'