summaryrefslogtreecommitdiff
path: root/bin/get-package-updates
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-10-04 08:39:49 +0200
committerErich Eckner <git@eckner.net>2018-10-04 08:39:49 +0200
commit21ae7d910ffe9a15aac8b3bc6b0c0cd7b225d50c (patch)
tree4dd22bf981e4c763d1bc04ead2e0e9aa5ecb47f0 /bin/get-package-updates
parenta37982151964ed01dd22c7ccbc65868acc1c1fc0 (diff)
downloadbuilder-21ae7d910ffe9a15aac8b3bc6b0c0cd7b225d50c.tar.xz
bin/get-package-updates: repair marking-as-blacklisted
Diffstat (limited to 'bin/get-package-updates')
-rwxr-xr-xbin/get-package-updates24
1 files changed, 11 insertions, 13 deletions
diff --git a/bin/get-package-updates b/bin/get-package-updates
index f77dee3..e240359 100755
--- a/bin/get-package-updates
+++ b/bin/get-package-updates
@@ -564,24 +564,22 @@ echo 'Done - mark decisions as final.'
$ s/,$/;/
'
printf 'UPDATE `build_assignments`'
- mysql_join_build_assignments_package_sources
+ printf ' SET `build_assignments`.`is_black_listed`=NULL;\n'
+ printf 'UPDATE `blacklist`'
+ printf ' JOIN `architectures`'
+ printf ' ON `architectures`.`name`=`blacklist`.`arch`'
+ printf ' JOIN `package_sources`'
+ printf ' ON `blacklist`.`pkgbase`=`package_sources`.`pkgbase`'
+ mysql_join_package_sources_build_assignments
printf ' JOIN `architecture_compatibilities`'
printf ' ON `build_assignments`.`architecture`=`architecture_compatibilities`.`built_for`'
- printf ' LEFT JOIN ('
- printf 'SELECT '
- printf '`blacklist`.`pkgbase`,'
- printf '`blacklist`.`reason`,'
- printf '`architectures`.`id` AS `arch`'
- printf ' FROM `blacklist`'
- printf ' JOIN `architectures`'
- printf ' ON `architectures`.`name`=`blacklist`.`arch`'
- printf ') AS `bl` ON `package_sources`.`pkgbase`=`bl`.`pkgbase`'
printf ' AND ('
- printf '`architecture_compatibilities`.`runs_on`=`bl`.`arch`'
+ printf '`architectures`.`id`=`architecture_compatibilities`.`runs_on`'
# shellcheck disable=SC2154
- printf ' OR `bl`.`arch`=%s' \
+ printf ' OR `architectures`.`id`=%s' \
"${architecture_ids__any}"
- printf ') SET `build_assignments`.`is_black_listed`=`bl`.`reason`;\n'
+ printf ')'
+ printf ' SET `build_assignments`.`is_black_listed`=`blacklist`.`reason`;\n'
printf 'DROP TEMPORARY TABLE `blacklist`;\n'
printf 'COMMIT;\n'