summaryrefslogtreecommitdiff
path: root/bin/get-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/get-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/get-assignment')
-rwxr-xr-xbin/get-assignment12
1 files changed, 8 insertions, 4 deletions
diff --git a/bin/get-assignment b/bin/get-assignment
index ba80798..0bfe48f 100755
--- a/bin/get-assignment
+++ b/bin/get-assignment
@@ -33,7 +33,8 @@ hand_out_assignment() {
mysql_join_upstream_repositories_package_sources
mysql_join_package_sources_build_assignments
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 `repositories`.`name`="build-list"'
printf ' AND `build_assignments`.`id`=from_base64("%s")' \
"$(printf '%s' "$1" | base64 -w0)"
@@ -97,7 +98,8 @@ currently_building=$(
printf ' FROM `build_assignments`'
mysql_join_build_assignments_build_slaves
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")' \
"$(printf '%s' "${slave_id}" | base64 -w0)"
printf ' AND `repositories`.`name`="build-list"'
@@ -137,7 +139,8 @@ next_building=$(
printf ' FROM `build_assignments`'
mysql_join_build_assignments_package_sources
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 ' LEFT'
mysql_join_build_assignments_failed_builds
printf ' WHERE `repositories`.`name`="build-list"'
@@ -176,7 +179,8 @@ count_pending=$(
printf 'SELECT count(*)'
printf ' FROM `build_assignments`'
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 `repositories`.`name`="build-list"'
printf ' AND `build_assignments`.`is_blocked` IS NULL'
printf ';\n'