From: Brian Quinion <github@brian.quinion.co.uk>
Date: Thu, 26 Apr 2012 13:50:58 +0000 (-0700)
Subject: Merge pull request #5 from mfn/improve_errmsg
X-Git-Tag: v2.0.0~77^2~4
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/b8db117bd0211cc974cb9e3468d431adb6da21c6?hp=210a899fc90081c8a8017f357c8dc1029a6d8a74

Merge pull request #5 from mfn/improve_errmsg

Do not swallow PEAR error during setup in import-data.
---

diff --git a/utils/setup.php b/utils/setup.php
index 6415ea12..db15aa44 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -124,7 +124,10 @@
 
 		$oDB =& getDB();
 		$x = $oDB->getRow('select * from place limit 1');
-		if (!$x || PEAR::isError($x)) fail('No Data');
+		if (PEAR::isError($x)) {
+			fail($x->getMessage());
+		}
+		if (!$x) fail('No Data');
 	}
 
 	if ($aCMDResult['create-functions'] || $aCMDResult['all'])