From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 26 Jan 2019 14:25:00 +0000 (+0100)
Subject: Do not allow --no-index together with --import-osmosis-all
X-Git-Tag: v3.3.0~37
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/8237aba8404202830d538eb9c9ab35bbcae76bd6

Do not allow --no-index together with --import-osmosis-all

Fixes #1283.
---

diff --git a/utils/update.php b/utils/update.php
index f4decdf1..3ef12cfb 100644
--- a/utils/update.php
+++ b/utils/update.php
@@ -445,6 +445,11 @@ if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) {
 
             $sSQL = 'update import_status set indexed = true';
             $oDB->query($sSQL);
+        } else {
+            if ($aResult['import-osmosis-all']) {
+                echo "Error: --no-index cannot be used with continuous imports (--import-osmosis-all).\n";
+                exit(1);
+            }
         }
 
         $fDuration = time() - $fStartTime;