Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-09-17 12:15:31 +0200
committerErich Eckner <git@eckner.net>2018-09-17 12:15:31 +0200
commit891b045f1801a4c646631ea90be10a94690ccf9f (patch)
tree6c63692094f2edabdba68fd3252b951b8233bdec
parente984775f9c539ccf3dd665ee86941835b054628a (diff)
bin/return-assignment: the slave reports back _its_ architecture, not the one of the build-assignment
-rwxr-xr-xbin/return-assignment6
1 files changed, 5 insertions, 1 deletions
diff --git a/bin/return-assignment b/bin/return-assignment
index 56b4dfb..191ff3b 100755
--- a/bin/return-assignment
+++ b/bin/return-assignment
@@ -283,7 +283,11 @@ build_assignment_id=$(
mysql_join_package_sources_upstream_repositories
mysql_join_build_assignments_binary_packages
mysql_join_binary_packages_binary_packages_in_repositories
- mysql_join_build_assignments_architectures
+ printf ' JOIN `architecture_compatibilities`'
+ printf ' ON `build_assignments`.`architecture`=`architecture_compatibilities`.`built_for`'
+ printf ' AND `architecture_compatibilities`.`fully_compatible`'
+ printf ' JOIN `architectures`'
+ printf ' ON `architecture_compatibilities`.`runs_on`=`architectures`.`id`'
printf ' WHERE `build_slaves`.`id`=from_base64("%s")' \
"$(
# shellcheck disable=SC2154