lib/mysql-functions: make mysql_join_binary_packages_repositories and mysql_join_repositories_binary_packages obsolete

1 files changed, 8 insertions, 4 deletions

diff --git a/bin/seed-build-list b/bin/seed-build-list
index 3a71429..6babca8 100755
--- a/bin/seed-build-list
+++ b/bin/seed-build-list
@@ -193,7 +193,8 @@ fi
   printf 'INSERT IGNORE INTO `ignore_packages` (`pkgname`)'
   printf ' SELECT DISTINCT `ignore_bin`.`pkgname`'
   printf ' FROM `binary_packages` AS `ignore_bin`'
-  mysql_join_binary_packages_repositories 'ignore_bin'
+  mysql_join_binary_packages_binary_packages_in_repositories 'ignore_bin'
+  mysql_join_binary_packages_in_repositories_repositories
   printf ' WHERE `repositories`.`name` IN ("build-list","deletion-list")'
   # packages with no not-to-be-deleted and at least on to-be-deleted version should be ignored
   printf ' OR ('
@@ -286,7 +287,8 @@ printf 'CREATE TEMPORARY TABLE `pkgbases` (`pkgbase` VARCHAR(64), `repository` V
     printf 'CREATE TEMPORARY TABLE `bin_ids` (`id` BIGINT, UNIQUE KEY (`id`));\n'
     printf 'INSERT IGNORE INTO `bin_ids`'
     printf ' SELECT `binary_packages`.`id` FROM `binary_packages`'
-    mysql_join_binary_packages_repositories
+    mysql_join_binary_packages_binary_packages_in_repositories
+    mysql_join_binary_packages_in_repositories_repositories
     printf ' AND `repositories`.`is_on_master_mirror`'
     printf ' AND `repositories`.`name`!="build-support"'
     mysql_join_binary_packages_dependencies
@@ -295,7 +297,8 @@ printf 'CREATE TEMPORARY TABLE `pkgbases` (`pkgbase` VARCHAR(64), `repository` V
     # nothing "less stable" has the same name
     printf ' WHERE NOT EXISTS ('
       printf 'SELECT * FROM `binary_packages` AS `subst_bp`'
-      mysql_join_binary_packages_repositories 'subst_bp' 'subst_r'
+      mysql_join_binary_packages_binary_packages_in_repositories 'subst_bp' 'subst_bir'
+      mysql_join_binary_packages_in_repositories_repositories 'subst_bir' 'subst_r'
       printf ' AND `subst_r`.`name`!="build-support"'
       printf ' JOIN `repository_stability_relations` ON `repository_stability_relations`.`less_stable`=`subst_r`.`stability`'
       printf ' WHERE `repository_stability_relations`.`more_stable`=`repositories`.`stability`'
@@ -304,7 +307,8 @@ printf 'CREATE TEMPORARY TABLE `pkgbases` (`pkgbase` VARCHAR(64), `repository` V
     printf ') AND NOT EXISTS ('
       printf 'SELECT * FROM `install_target_providers`'
       mysql_join_install_target_providers_binary_packages '' 'subst_bp'
-      mysql_join_binary_packages_repositories 'subst_bp' 'subst_r'
+      mysql_join_binary_packages_binary_packages_in_repositories 'subst_bp' 'subst_bir'
+      mysql_join_binary_packages_in_repositories_repositories 'subst_bir' 'subst_r'
       printf ' AND `subst_r`.`name` NOT IN ("build-support","deletion-list","to-be-decided")'
       printf ' WHERE `install_target_providers`.`install_target`=`dependencies`.`depending_on`'
     printf ')'