summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-11-14 11:16:12 +0100
committerErich Eckner <git@eckner.net>2018-11-14 11:16:12 +0100
commiteafb34bb15d612e4b36d0e2606bd381b116c1023 (patch)
tree51397830e97ed984512830b5d464ee04033dae55
parent95c7041e7494d419e2a5852d30043da488a7b55a (diff)
downloadbuilder-eafb34bb15d612e4b36d0e2606bd381b116c1023.tar.xz
bin/sanity-check: simultanously being on the build- and deletion-list is ok, as long as the architectures fulfill some conditions (which were wrongly represented until now)
-rwxr-xr-xbin/sanity-check10
1 files changed, 7 insertions, 3 deletions
diff --git a/bin/sanity-check b/bin/sanity-check
index b9b287c..ee521d3 100755
--- a/bin/sanity-check
+++ b/bin/sanity-check
@@ -217,9 +217,13 @@ while [ $# -gt 0 ]; do
printf ' AND `a_r`.`name`="build-list"'
printf ' JOIN `binary_packages` AS `b`'
printf ' ON `a`.`pkgname`=`b`.`pkgname`'
- printf ' JOIN `architecture_compatibilities`'
- printf ' ON `architecture_compatibilities`.`built_for`=`a`.`architecture`'
- printf ' AND `architecture_compatibilities`.`runs_on`=`b`.`architecture`'
+ printf ' JOIN `architecture_compatibilities` AS `ac_a`'
+ printf ' ON `ac_a`.`fully_compatible`'
+ printf ' AND `ac_a`.`built_for`=`a`.`architecture`'
+ printf ' JOIN `architecture_compatibilities` AS `ac_b`'
+ printf ' ON `ac_b`.`fully_compatible`'
+ printf ' AND `ac_b`.`built_for`=`b`.`architecture`'
+ printf ' AND `ac_a`.`runs_on`=`ac_b`.`runs_on`'
mysql_join_binary_packages_binary_packages_in_repositories 'b' 'bir'
mysql_join_binary_packages_in_repositories_repositories 'bir' 'b_r'
printf ' AND `b_r`.`name`="deletion-list";\n'