From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 5 Jun 2014 20:31:59 +0000 (+0200)
Subject: revert error checking on pgsql restore
X-Git-Tag: v2.3.0~26
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/6a5b5b3c366b33da1045e39193f2e52b14c6d4ed

revert error checking on pgsql restore

wikipedia dumps create expected errors on restore, fixes #142
---

diff --git a/osm2pgsql b/osm2pgsql
index b59765e3..49089cb1 160000
--- a/osm2pgsql
+++ b/osm2pgsql
@@ -1 +1 @@
-Subproject commit b59765e3ac591ff84f21f4a1153e7c18a2d2b855
+Subproject commit 49089cb1a3c72ad97b57db21716a5fa07d4f2f8a
diff --git a/utils/setup.php b/utils/setup.php
index a1d8ae5d..71e7dab5 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -802,10 +802,6 @@
 		fclose($ahPipes[1]);
 
 		$iReturn = proc_close($hProcess);
-		if ($iReturn > 0)
-		{
-			fail("pgsql returned with error code ($iReturn)");
-		}
 	}
 
 	function pgsqlRunDropAndRestore($sDumpFile)
@@ -834,10 +830,6 @@
 		fclose($ahPipes[1]);
 
 		$iReturn = proc_close($hProcess);
-		if ($iReturn > 0)
-		{
-			fail("pgsql returned with error code ($iReturn)");
-		}
 	}
 
 	function passthruCheckReturn($cmd)