]> git.openstreetmap.org Git - nominatim.git/commitdiff
pgsqlRunPartitionScript needs global $aCMDResult
authorIrlJidel <donal.diamond@gmail.com>
Thu, 14 Jul 2016 18:49:58 +0000 (19:49 +0100)
committerGitHub <noreply@github.com>
Thu, 14 Jul 2016 18:49:58 +0000 (19:49 +0100)
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

utils/setup.php

index 94c7edb5209d13fc3d6d7d1f7e6c365a0ddb0641..992034c77943cbbe94e5603894cc73722b13a5a4 100755 (executable)
 
        function pgsqlRunPartitionScript($sTemplate)
        {
+               global $aCMDResult;
                $oDB =& getDB();
 
                $sSQL = 'select distinct partition from country_name';