From cc4f6dcf65e004fa5c69082953fe29db0d2e158e Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Mon, 17 Jul 2023 20:58:14 +0200 Subject: bin/sanity-check: do all db operations after getting the lock * no need to trouble the db, if we don't run, because we got no lock --- bin/sanity-check | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/bin/sanity-check b/bin/sanity-check index 36d4db0..4ab0c9e 100755 --- a/bin/sanity-check +++ b/bin/sanity-check @@ -46,29 +46,6 @@ eval set -- "$( block_flag='-n' silence=0 -# shellcheck disable=SC2016 -repos=$( - { - printf 'SELECT DISTINCT `repositories`.`name`' - printf ' FROM `repositories`' - printf ' WHERE `repositories`.`is_on_master_mirror`;\n' - } | \ - mysql_run_query -) -# shellcheck disable=SC2016 -archs=$( - { - printf 'SELECT DISTINCT `architectures`.`name`' - printf ' FROM `architectures`' - printf ' WHERE EXISTS (' - printf 'SELECT 1' - printf ' FROM `repositories`' - printf ' WHERE `repositories`.`architecture`=`architectures`.`id`' - printf ' AND `repositories`.`is_on_master_mirror`' - printf ');\n' - } | \ - mysql_run_query -) while true do @@ -104,6 +81,30 @@ if ! verbose_flock ${block_flag} 9; then exit fi +# shellcheck disable=SC2016 +repos=$( + { + printf 'SELECT DISTINCT `repositories`.`name`' + printf ' FROM `repositories`' + printf ' WHERE `repositories`.`is_on_master_mirror`;\n' + } | \ + mysql_run_query +) +# shellcheck disable=SC2016 +archs=$( + { + printf 'SELECT DISTINCT `architectures`.`name`' + printf ' FROM `architectures`' + printf ' WHERE EXISTS (' + printf 'SELECT 1' + printf ' FROM `repositories`' + printf ' WHERE `repositories`.`architecture`=`architectures`.`id`' + printf ' AND `repositories`.`is_on_master_mirror`' + printf ');\n' + } | \ + mysql_run_query +) + mysql_cleanup finish() { -- cgit v1.2.3-70-g09d2