From 22fed81b1fbce3431d4c2349b0694d3bb7c6a36b Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Mon, 22 Jan 2018 15:51:25 +0100 Subject: bin/build-master-status-from-mysql: include build list in sanity check --- bin/build-master-status-from-mysql | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) (limited to 'bin/build-master-status-from-mysql') diff --git a/bin/build-master-status-from-mysql b/bin/build-master-status-from-mysql index 12278be..2ed9a24 100755 --- a/bin/build-master-status-from-mysql +++ b/bin/build-master-status-from-mysql @@ -32,7 +32,31 @@ ' | \ sponge "${webserver_directory}/build-slaves.html" -mysql_sanity_check | \ +{ + mysql_sanity_check || true + { + # shellcheck disable=SC2016 + { + printf 'SELECT `package_sources`.`pkgbase`,`package_sources`.`git_revision`,`package_sources`.`mod_git_revision`,`upstream_repositories`.`name`' + printf ' FROM `package_sources`' + printf ' JOIN `%s` ON `%s`.`%s`=`%s`.`id`' \ + 'upstream_repositories' 'package_sources' 'upstream_package_repository' 'upstream_repositories' \ + 'build_assignments' 'build_assignments' 'package_source' 'package_sources' \ + 'binary_packages' 'binary_packages' 'build_assignment' 'build_assignments' \ + 'repositories' 'binary_packages' 'repository' 'repositories' + printf ' WHERE `repositories`.`name`="build-list"' + } | \ + ${mysql_command} --batch | \ + sed ' + 1d + y/\t/ / + s/^/+ / + ' + sed 's/^/- /' "${work_dir}/build-list" + } | \ + sort -k2 -k1,1 | \ + uniq -uf1 +} | \ sed ' s,^-.*$,\0, s,^+.*$,\0, -- cgit v1.2.3-54-g00ecf