From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 20 Jul 2018 20:28:54 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~319
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/f6cf89fdde89f3ae26cb5146c6b2124cf9022f77?hp=-c

Merge remote-tracking branch 'upstream/master'
---

f6cf89fdde89f3ae26cb5146c6b2124cf9022f77
diff --combined CMakeLists.txt
index 3f06d842,2096c43d..347f4d48
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -53,7 -53,7 +53,7 @@@ link_directories(${PostgreSQL_LIBRARY_D
  
  find_program(PYOSMIUM pyosmium-get-changes)
  if (NOT EXISTS "${PYOSMIUM}")
-     set(PYOSMIUM_PATH "/nonexistent")
+     set(PYOSMIUM_PATH "")
          message(WARNING "pyosmium-get-changes not found (required for updates)")
  else()
      set(PYOSMIUM_PATH "${PYOSMIUM}")
@@@ -93,14 -93,6 +93,14 @@@ set(CUSTOMFILE
      website/reverse.php
      website/search.php
      website/status.php
 +    website/403.html
 +    website/509.html
 +    website/crossdomain.xml
 +    website/favicon.ico
 +    website/last_update.php
 +    website/nominatim.xml
 +    website/robots.txt
 +    website/taginfo.json
      utils/blocks.php
      utils/country_languages.php
      utils/imports.php
diff --combined utils/update.php
index 62c07fac,6caa7e4b..db920826
--- a/utils/update.php
+++ b/utils/update.php
@@@ -40,7 -40,6 +40,7 @@@ $aCMDOption
  getCmdOpt($_SERVER['argv'], $aCMDOptions, $aResult, true, true);
  
  if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;
 +
  if (!isset($aResult['index-rank'])) $aResult['index-rank'] = 0;
  
  date_default_timezone_set('Etc/UTC');
@@@ -69,6 -68,22 +69,22 @@@ if ($aResult['init-updates']) 
          echo "Does the URL point to a directory containing OSM update data?\n\n";
          fail('replication URL not reachable.');
      }
+     // sanity check for pyosmium-get-changes
+     if (!CONST_Pyosmium_Binary) {
+         echo "\nCONST_Pyosmium_Binary not configured.\n";
+         echo "You need to install pyosmium and set up the path to pyosmium-get-changes\n";
+         echo "in your local settings file.\n\n";
+         fail('CONST_Pyosmium_Binary not configured');
+     }
+     $aOutput = 0;
+     $sCmd = CONST_Pyosmium_Binary.' --help';
+     exec($sCmd, $aOutput, $iRet);
+     if ($iRet != 0) {
+         echo "Cannot execute pyosmium-get-changes.\n";
+         echo "Make sure you have pyosmium installed correctly\n";
+         echo "and have set up CONST_Pyosmium_Binary to point to pyosmium-get-changes.\n";
+         fail('pyosmium-get-changes not found or not usable');
+     }
      $sSetup = CONST_InstallPath.'/utils/setup.php';
      $iRet = -1;
      passthru($sSetup.' --create-functions --enable-diff-updates', $iRet);