]> git.openstreetmap.org Git - nominatim.git/commitdiff
Do not allow --no-index together with --import-osmosis-all
authorSarah Hoffmann <lonvia@denofr.de>
Sat, 26 Jan 2019 14:25:00 +0000 (15:25 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Sat, 26 Jan 2019 14:25:00 +0000 (15:25 +0100)
Fixes #1283.

utils/update.php

index f4decdf1e8dd5930b20a0d64d0b457ae13220c0e..3ef12cfb588fbb8fef7b9578d9b2bd7426bd1ced 100644 (file)
@@ -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;