From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 31 Jan 2020 17:19:12 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~258
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/f5718ed909f1ff93d238f2c3fac2429a420efbfa?hp=-c

Merge remote-tracking branch 'upstream/master'
---

f5718ed909f1ff93d238f2c3fac2429a420efbfa
diff --combined utils/update.php
index d91c8a76,c1dc2ab9..2fa773fe
--- a/utils/update.php
+++ b/utils/update.php
@@@ -49,7 -49,6 +49,7 @@@ $aCMDOption
  getCmdOpt($_SERVER['argv'], $aCMDOptions, $aResult, true, true);
  
  if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;
 +
  if (!isset($aResult['index-rank'])) $aResult['index-rank'] = 0;
  
  date_default_timezone_set('Etc/UTC');
@@@ -83,6 -82,12 +83,12 @@@ if (!is_null(CONST_Osm2pgsql_Flatnode_F
  }
  
  $sIndexCmd = CONST_BasePath.'/nominatim/nominatim.py';
+ if (!$aResult['quiet']) {
+     $sIndexCmd .= ' -v';
+ }
+ if ($aResult['verbose']) {
+     $sIndexCmd .= ' -v';
+ }
  
  if ($aResult['init-updates']) {
      // sanity check that the replication URL is correct