summaryrefslogtreecommitdiff
path: root/bin/return-assignment
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-05-25 13:40:36 +0200
committerErich Eckner <git@eckner.net>2018-05-25 13:40:36 +0200
commit8aeca7194277ab52126bb3358635743be2ed7e2d (patch)
tree9ddf06fcf276eeb6f563def98985826aaeb4ff14 /bin/return-assignment
parent64277df1805bb165184267cab3668166da780b1e (diff)
downloadbuilder-8aeca7194277ab52126bb3358635743be2ed7e2d.tar.xz
lib/mysql-functions: make mysql_join_binary_packages_repositories and mysql_join_repositories_binary_packages obsolete
Diffstat (limited to 'bin/return-assignment')
-rwxr-xr-xbin/return-assignment12
1 files changed, 8 insertions, 4 deletions
diff --git a/bin/return-assignment b/bin/return-assignment
index fdb7e1c..0ec7a2e 100755
--- a/bin/return-assignment
+++ b/bin/return-assignment
@@ -57,7 +57,8 @@ if [ "$5" = 'ERROR' ]; then
mysql_join_build_assignments_package_sources
mysql_join_package_sources_upstream_repositories
mysql_join_build_assignments_binary_packages
- mysql_join_binary_packages_repositories
+ mysql_join_binary_packages_binary_packages_in_repositories
+ mysql_join_binary_packages_in_repositories_repositories
printf ' WHERE `build_slaves`.`id`=from_base64("%s")' \
"$(
# shellcheck disable=SC2154
@@ -244,7 +245,8 @@ infos=$(
mysql_join_build_assignments_package_sources
mysql_join_package_sources_upstream_repositories
mysql_join_build_assignments_binary_packages
- mysql_join_binary_packages_repositories
+ mysql_join_binary_packages_binary_packages_in_repositories
+ mysql_join_binary_packages_in_repositories_repositories
printf ' WHERE `build_slaves`.`id`=from_base64("%s")' \
"$(
# shellcheck disable=SC2154
@@ -408,7 +410,8 @@ packages=$(
mysql_package_name_query
printf ' FROM `binary_packages`'
mysql_join_binary_packages_architectures
- mysql_join_binary_packages_repositories
+ mysql_join_binary_packages_binary_packages_in_repositories
+ mysql_join_binary_packages_in_repositories_repositories
printf ' WHERE `binary_packages`.`build_assignment`=from_base64("%s")' \
"$(
printf '%s' "${build_assignment_id}" | \
@@ -618,7 +621,8 @@ trigger_mirror_refreshs
printf 'INSERT INTO `loops_to_delete`'
printf ' SELECT `build_dependency_loops`.`loop` FROM `build_dependency_loops`'
mysql_join_build_dependency_loops_binary_packages
- mysql_join_binary_packages_repositories
+ mysql_join_binary_packages_binary_packages_in_repositories
+ mysql_join_binary_packages_in_repositories_repositories
printf ' WHERE NOT `repositories`.`name` = "build-list";\n'
printf 'COMMIT;\n'
printf 'DELETE FROM `build_dependency_loops` WHERE EXISTS ('