From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 3 Apr 2013 20:40:33 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~628
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/ca11fc90e6e646335045e087f03d824236c798f2

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

ca11fc90e6e646335045e087f03d824236c798f2
diff --cc utils/update.php
index 0918730d,76d6f858..e8972f1d
--- a/utils/update.php
+++ b/utils/update.php
@@@ -353,8 -353,9 +353,9 @@@
  		$sOsmosisCMD = CONST_Osmosis_Binary;
  		$sOsmosisConfigDirectory = CONST_BasePath.'/settings';
  		$sCMDDownload = $sOsmosisCMD.' --read-replication-interval workingDirectory='.$sOsmosisConfigDirectory.' --simplify-change --write-xml-change '.$sImportFile;
+ 		$sCMDCheckReplicationLag = $sOsmosisCMD.' -q --read-replication-lag workingDirectory='.$sOsmosisConfigDirectory;
  		$sCMDImport = CONST_Osm2pgsql_Binary.' -klas -C 2000 -O gazetteer -d '.$aDSNInfo['database'].' '.$sImportFile;
 -		$sCMDIndex = $sBasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -t '.$aResult['index-instances'];
 +		$sCMDIndex = $sBasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'];
  		if (!$aResult['no-npi']) {
  			$sCMDIndex .= '-F ';
  		}