From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 29 Jul 2020 07:29:18 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~224
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/8323bea84493b862946ab9ca065a0862e11db362?hp=-c

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

8323bea84493b862946ab9ca065a0862e11db362
diff --combined utils/update.php
index dd0dc6d0,cba58d31..30c4ae46
--- 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');
@@@ -104,7 -103,9 +104,9 @@@ $oIndexCmd = (new \Nominatim\Shell(CONS
               ->addParams('--database', $aDSNInfo['database'])
               ->addParams('--port', $aDSNInfo['port'])
               ->addParams('--threads', $aResult['index-instances']);
- 
+ if (!$aResult['quiet']) {
+     $oIndexCmd->addParams('--verbose');
+ }
  if ($aResult['verbose']) {
      $oIndexCmd->addParams('--verbose');
  }
@@@ -152,7 -153,6 +154,6 @@@ if ($aResult['init-updates']) 
                                        'enable-diff-updates' => true,
                                        'verbose' => $aResult['verbose']
                                       ));
-         $cSetup->connect();
          $cSetup->createFunctions();
      }