From: IrlJidel <donal.diamond@gmail.com>
Date: Thu, 14 Jul 2016 18:49:58 +0000 (+0100)
Subject: pgsqlRunPartitionScript needs global $aCMDResult
X-Git-Tag: v3.0.0~154^2
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/ca924426019c61ca8f9e2b27d1c4883625c3aa03?hp=665de339e5c1afde21d836ce4be9abe94ae483e0

pgsqlRunPartitionScript needs global $aCMDResult

function pgsqlRunPartitionScript  was missing global $aCMDResult

setup was failing with

...
PHP Notice:  Undefined variable: aCMDResult in /home/roles/nominatim/app/Nominatim/build/utils/setup.php on line 768
NOTICE:  type "nearplace" does not exist, skipping
..
ERROR:  relation "location_area_large_0" already exists
ERROR: pgsql returned with error code (3)
pgsql returned with error code (3)
Command exited with non-zero status 255
---

diff --git a/utils/setup.php b/utils/setup.php
index 94c7edb5..992034c7 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -761,6 +761,7 @@
 
 	function pgsqlRunPartitionScript($sTemplate)
 	{
+		global $aCMDResult;
 		$oDB =& getDB();
 
 		$sSQL = 'select distinct partition from country_name';