X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/6f51c1ba330e63804af8514faab7d9df7525b8f7..bf1f6a997ccdb115f7c77ab8ded34e80dca7abeb:/nominatim/tools/exec_utils.py diff --git a/nominatim/tools/exec_utils.py b/nominatim/tools/exec_utils.py index 2e5c4801..8417f146 100644 --- a/nominatim/tools/exec_utils.py +++ b/nominatim/tools/exec_utils.py @@ -17,7 +17,7 @@ from urllib.parse import urlencode from nominatim.config import Configuration from nominatim.typing import StrPath -from nominatim.version import version_str +from nominatim.version import NOMINATIM_VERSION from nominatim.db.connection import get_pg_env LOG = logging.getLogger() @@ -125,7 +125,7 @@ def run_osm2pgsql(options: Mapping[str, Any]) -> None: ] if str(options['osm2pgsql_style']).endswith('.lua'): - env['LUA_PATH'] = ';'.join((str(options['osm2pgsql_style_path'] / 'flex-base.lua'), + env['LUA_PATH'] = ';'.join((str(options['osm2pgsql_style_path'] / '?.lua'), os.environ.get('LUAPATH', ';'))) cmd.extend(('--output', 'flex')) else: @@ -162,7 +162,7 @@ def run_osm2pgsql(options: Mapping[str, Any]) -> None: def get_url(url: str) -> str: """ Get the contents from the given URL and return it as a UTF-8 string. """ - headers = {"User-Agent": f"Nominatim/{version_str()}"} + headers = {"User-Agent": f"Nominatim/{NOMINATIM_VERSION!s}"} try: request = urlrequest.Request(url, headers=headers)