From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 27 May 2017 15:03:59 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~389
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/91129b37f605a06f85bc8aa07eede84fb16ad644?hp=-c

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

91129b37f605a06f85bc8aa07eede84fb16ad644
diff --combined utils/update.php
index 972a6fdf,2b72fe82..f7f20aa3
--- a/utils/update.php
+++ b/utils/update.php
@@@ -38,7 -38,6 +38,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');
@@@ -263,12 -262,12 +263,12 @@@ if ($aResult['import-osmosis'] || $aRes
              }
  
              // Download the next batch of changes.
-             unlink($sImportFile);
              do {
                  $fCMDStartTime = time();
-                 $iNextSeq = (int) $aLastState['sequence_id'] + 1;
+                 $iNextSeq = (int) $aLastState['sequence_id'];
                  unset($aOutput);
                  echo "$sCMDDownload -I $iNextSeq\n";
+                 unlink($sImportFile);
                  exec($sCMDDownload.' -I '.$iNextSeq, $aOutput, $iResult);
  
                  if ($iResult == 3) {