summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-08-26 20:15:55 +0200
committerErich Eckner <git@eckner.net>2019-08-26 20:15:55 +0200
commitd2947128a9654dae4abcb6fecfa25f4001c0be23 (patch)
tree7d99184a8106b6eb6d0328ecf1d2f1787883afdf /bin
parent9170c345471e74155cfb8dacd0b231e152535582 (diff)
downloadbuilder-d2947128a9654dae4abcb6fecfa25f4001c0be23.tar.xz
bin/return-assignment: use mysql_join_* more thoroughly
Diffstat (limited to 'bin')
-rwxr-xr-xbin/return-assignment6
1 files changed, 2 insertions, 4 deletions
diff --git a/bin/return-assignment b/bin/return-assignment
index db7855b..c7805cb 100755
--- a/bin/return-assignment
+++ b/bin/return-assignment
@@ -1045,13 +1045,11 @@ cut -d' ' -f4,5 "${tmp_dir}/repository-ids" | \
printf ' ON `pkg_hashes`.`pkgid`=`binary_packages`.`id`'
mysql_join_binary_packages_build_assignments
mysql_join_build_assignments_package_sources
- printf ' JOIN `toolchain_order` AS `late`'
- printf ' ON `late`.`pkgbase`=`package_sources`.`pkgbase`'
+ mysql_join_package_sources_toolchain_order '' 'late'
printf ' JOIN `toolchain_order` AS `early`'
printf ' ON `early`.`number`<`late`.`number`'
printf ' AND `early`.`pkgbase`!=`late`.`pkgbase`'
- printf ' JOIN `package_sources` AS `early_ps`'
- printf ' ON `early`.`pkgbase`=`early_ps`.`pkgbase`'
+ mysql_join_toolchain_order_package_sources 'early' 'early_ps'
mysql_join_package_sources_build_assignments 'early_ps' 'early_ba'
mysql_join_build_assignments_binary_packages 'early_ba' 'early_bp'
printf ' WHERE ('