From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 25 Sep 2013 21:05:47 +0000 (+0200)
Subject: make import-osmosis(-all) fail with error code!=0
X-Git-Tag: deploy~566^2
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/bf182ba2dc5fda3b249bf192a8c488e564576fd7

make import-osmosis(-all) fail with error code!=0
---

diff --git a/utils/update.php b/utils/update.php
index ba0a5c26..533b48d6 100755
--- a/utils/update.php
+++ b/utils/update.php
@@ -446,7 +446,7 @@
 				if ($iErrorLevel)
 				{
 					echo "Error: $iErrorLevel\n";
-					exit;
+					exit($iErrorLevel);
 				}
 				echo "Completed for $sBatchEnd in ".round((time()-$fCMDStartTime)/60,2)." minutes\n";
 				$sSQL = "INSERT INTO import_osmosis_log values ('$sBatchEnd',$iFileSize,'".date('Y-m-d H:i:s',$fCMDStartTime)."','".date('Y-m-d H:i:s')."','osm2pgsql')";
@@ -469,7 +469,7 @@
 				if (PEAR::isError($iFileID))
 				{
 					echo $iFileID->getMessage()."\n";
-					exit;
+					exit(-1);
 				} 
 				$sFileDir = CONST_BasePath.'/export/diff/';
 				$sFileDir .= str_pad(floor($iFileID/1000000), 3, '0', STR_PAD_LEFT);
@@ -495,7 +495,7 @@
 				if ($iErrorLevel)
 				{
 					echo "Error: $iErrorLevel\n";
-					exit;
+					exit($iErrorLevel);
 				}
 
 				if (!$aResult['no-npi'])
@@ -510,7 +510,7 @@
 					if ($iErrorLevel)
 					{
 						echo "Error: $iErrorLevel\n";
-						exit;
+						exit($iErrorLevel);
 					}
 
 					rename($sFileDir.'/'.str_pad($iFileID % 1000, 3, '0', STR_PAD_LEFT).".npi.out.bz2",