revert error checking on pgsql restore

wikipedia dumps create expected errors on restore, fixes #142

diff --git a/osm2pgsql b/osm2pgsql
index b59765e3ac591ff84f21f4a1153e7c18a2d2b855..49089cb1a3c72ad97b57db21716a5fa07d4f2f8a 160000 (submodule)
--- a/osm2pgsql
+++ b/osm2pgsql
@@ -1 +1 @@
-Subproject commit b59765e3ac591ff84f21f4a1153e7c18a2d2b855
+Subproject commit 49089cb1a3c72ad97b57db21716a5fa07d4f2f8a

diff --git a/utils/setup.php b/utils/setup.php
index a1d8ae5db9ef1d122c11ca9a55e6df41773d0e08..71e7dab59810573a7699cff5fd2eb980b8703e79 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -802,10 +802,6 @@
                fclose($ahPipes[1]);
 
                $iReturn = proc_close($hProcess);
                fclose($ahPipes[1]);
 
                $iReturn = proc_close($hProcess);

-               if ($iReturn > 0)
-               {
-                       fail("pgsql returned with error code ($iReturn)");
-               }

        }
 
        function pgsqlRunDropAndRestore($sDumpFile)
        }
 
        function pgsqlRunDropAndRestore($sDumpFile)


@@ -834,10 +830,6 @@
                fclose($ahPipes[1]);
 
                $iReturn = proc_close($hProcess);
                fclose($ahPipes[1]);
 
                $iReturn = proc_close($hProcess);

-               if ($iReturn > 0)
-               {
-                       fail("pgsql returned with error code ($iReturn)");
-               }

        }
 
        function passthruCheckReturn($cmd)
        }
 
        function passthruCheckReturn($cmd)