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 a1811af39bad2c9b0e670df7ceb3b8613a40fde7..d5d011c48fd05d6978e4e108dfdc36440185ff3c 100644 (file)
--- 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 3031026b8cbeba3f01edd1d164187e7d8242b9c2..7b8da200b5a8598416bb9ef78f76dc3eda8347a5 100644 (file)
--- 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()