X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/7704b3fc7b8d099ad2bea89d780723a76129095a..434bd5a5bbf4083ee8a2f988d33438f3858906b9:/nominatim/tools/exec_utils.py diff --git a/nominatim/tools/exec_utils.py b/nominatim/tools/exec_utils.py index ab2ccc7c..566ac06e 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() @@ -119,7 +119,7 @@ def run_osm2pgsql(options: Mapping[str, Any]) -> None: cmd = [str(options['osm2pgsql']), '--hstore', '--latlon', '--slim', '--log-progress', 'true', - '--number-processes', str(options['threads']), + '--number-processes', '1' if options['append'] else str(options['threads']), '--cache', str(options['osm2pgsql_cache']), '--style', str(options['osm2pgsql_style']) ] @@ -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)