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

diff --combined utils/update.php
index d1ded5adb203df0d7031210b241322fac5185d8d,dfd533fd696adddc6a44bc652a969143f36c0200..0e26b31152d1d3445ae233defb094b3d25bd524f
--- 1/utils/update.php
--- 2/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);