bin/db-update,bin/bootstrap-mysql: replaced packages may be in a differen, but equally-stable repository

1 files changed, 5 insertions, 3 deletions

diff --git a/bin/bootstrap-mysql b/bin/bootstrap-mysql
index ee51e1a..eb6462c 100755
--- a/bin/bootstrap-mysql
+++ b/bin/bootstrap-mysql
@@ -108,14 +108,15 @@ fi
   printf ' FROM `moveable_bpir`'
   printf ' JOIN `binary_packages_in_repositories` AS `m_bpir` ON `m_bpir`.`id`=`moveable_bpir`.`id`'
   mysql_join_binary_packages_in_repositories_binary_packages 'm_bpir' 'm_bp'
-  mysql_join_binary_packages_in_repositories_repositories 'm_bpir' 'm_r'
+  mysql_join_binary_packages_in_repositories_repositories 'm_bpir' 'm_from_r'
   mysql_join_binary_packages_build_assignments 'm_bp' 'm_ba'
   mysql_join_build_assignments_package_sources 'm_ba' 'm_ps'
   mysql_join_package_sources_upstream_repositories 'm_ps' 'm_ur'
   mysql_join_upstream_repositories_repository_moves 'm_ur'
-  printf ' AND `repository_moves`.`from_repository`=`m_r`.`id`'
+  printf ' AND `repository_moves`.`from_repository`=`m_from_r`.`id`'
   # in its target repository
-  printf ' JOIN `repositories` AS `r_r` ON `repository_moves`.`to_repository`=`r_r`.`id`'
+  printf ' JOIN `repositories` AS `m_to_r` ON `repository_moves`.`to_repository`=`m_to_r`.`id`'
+  printf ' JOIN `repositories` AS `r_r` ON `r_r`.`stability`=`m_to_r`.`stability`'
   mysql_join_repositories_binary_packages_in_repositories 'r_r' 'r_bpir'
   mysql_join_binary_packages_in_repositories_binary_packages 'r_bpir' 'r_bp'
   # all packages with identical names
@@ -219,6 +220,7 @@ fi
   # we need to check wether req_bp's dependency is (un)critical
   mysql_join_binary_packages_binary_packages_in_repositories 'req_bp' 'req_bpir'
   mysql_join_binary_packages_in_repositories_repositories 'req_bpir' 'req_r'
+  printf ' AND `repl_r`.`architecture`=`req_r`.`architecture`'
   # dependent package is "less stable" than dependency
   printf ' JOIN `repository_stability_relations` AS `repl_rr`'
   printf ' ON `repl_rr`.`more_stable`=`repl_r`.`stability`'