From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 9 Sep 2013 11:46:59 +0000 (+0200)
Subject: Merge branch 'osmosis_error_return' of https://github.com/woodpeck/Nominatim
X-Git-Tag: v2.2.0~35
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/8fd7d319b7ef6ee4d4f8cf3b61eb47903e7fb1eb?ds=inline;hp=-c

Merge branch 'osmosis_error_return' of https://github.com/woodpeck/Nominatim
---

8fd7d319b7ef6ee4d4f8cf3b61eb47903e7fb1eb
diff --combined utils/update.php
index d1ded5ad,dfd533fd..0e26b311
--- a/utils/update.php
+++ b/utils/update.php
@@@ -103,7 -103,7 +103,7 @@@
  			$sNextFile = $aResult['import-diff'];
  			if (!file_exists($sNextFile))
  			{
 -				echo "Cannot open $nextFile\n";
 +				echo "Cannot open $sNextFile\n";
  				exit;
  			}
  			// Don't update the import status - we don't know what this file contains
@@@ -391,7 -391,7 +391,7 @@@
  
  						unset($aReplicationLag);
  						exec($sCMDCheckReplicationLag, $aReplicationLag, $iErrorLevel); 
- 						while ($iErrorLevel == 1 || $aReplicationLag[0] < 1)
+ 						while ($iErrorLevel > 0 || $aReplicationLag[0] < 1)
  						{
  							if ($iErrorLevel)
  							{
@@@ -412,7 -412,7 +412,7 @@@
  					$fCMDStartTime = time();
  					echo $sCMDDownload."\n";
  					exec($sCMDDownload, $sJunk, $iErrorLevel);
- 					while ($iErrorLevel == 1)
+ 					while ($iErrorLevel > 0)
  					{
  						echo "Error: $iErrorLevel\n";
  						sleep(60);