hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 15:47:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge issues

Browse Source
This commit is contained in:
Sarah Hoffmann
2024-06-09 16:22:53 +02:00
parent 63da70685a
commit 44d5148e5f
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/nominatim_db/tools/exec_utils.py
View File

@@ -30,13 +30,7 @@ def run_osm2pgsql(options: Mapping[str, Any]) -> None:
"""
env = get_pg_env(options['dsn'])
osm2pgsql_cmd = options['osm2pgsql']
if osm2pgsql_cmd is None:
osm2pgsql_cmd = shutil.which('osm2pgsql')
if osm2pgsql_cmd is None:
raise RuntimeError('osm2pgsql executable not found. Please install osm2pgsql first.')
cmd = [str(osm2pgsql_cmd),
cmd = [_find_osm2pgsql_cmd(options['osm2pgsql']),
'--slim',
'--log-progress', 'true',
'--number-processes', '1' if options['append'] else str(options['threads']),
@@ -82,3 +76,14 @@ def run_osm2pgsql(options: Mapping[str, Any]) -> None:
subprocess.run(cmd, cwd=options.get('cwd', '.'),
input=options.get('import_data'),
env=env, check=True)
def _find_osm2pgsql_cmd(cmdline: str) -> str:
if cmdline is not None:
return cmdline
in_path = shutil.which('osm2pgsql')
if in_path is None:
raise RuntimeError('osm2pgsql executable not found. Please install osm2pgsql first.')
return str(in_path)