From: Sarah Hoffmann Date: Fri, 19 Feb 2021 17:32:00 +0000 (+0100) Subject: fix return code for check database run with 'not applicable' X-Git-Tag: v3.7.0~32^2~1 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/4b32cbe518949a4bbc40a8df59e696500bd1d5cf fix return code for check database run with 'not applicable' --- diff --git a/lib-php/admin/check_import_finished.php b/lib-php/admin/check_import_finished.php index a1811af3..d5d011c4 100644 --- a/lib-php/admin/check_import_finished.php +++ b/lib-php/admin/check_import_finished.php @@ -8,4 +8,3 @@ loadSettings(getcwd()); (new \Nominatim\Shell(getSetting('NOMINATIM_TOOL'))) ->addParams('admin', '--check-database') ->run(); - diff --git a/nominatim/tools/check_database.py b/nominatim/tools/check_database.py index 3031026b..7b8da200 100644 --- a/nominatim/tools/check_database.py +++ b/nominatim/tools/check_database.py @@ -70,7 +70,7 @@ def check_database(config): if ret == CheckState.FATAL: conn.close() return 1 - if ret != CheckState.OK: + if ret in (CheckState.FATAL, CheckState.FAIL): overall_result = 1 conn.close()