use check parameter of subprocess.run

[nominatim.git] / nominatim / admin / exec_utils.py

diff --git a/nominatim/admin/exec_utils.py b/nominatim/admin/exec_utils.py
index f3f59dea9cbd26c73670da1f1ae1586540ee8f32..0158227957f04bc6afa76f820e276672213a1e7f 100644 (file)
--- a/nominatim/admin/exec_utils.py
+++ b/nominatim/admin/exec_utils.py
@@ -21,9 +21,7 @@ def run_legacy_script(script, *args, nominatim_env=None, throw_on_fail=False):
     if not env['NOMINATIM_OSM2PGSQL_BINARY']:
         env['NOMINATIM_OSM2PGSQL_BINARY'] = nominatim_env.osm2pgsql_path
 
-    proc = subprocess.run(cmd, cwd=str(nominatim_env.project_dir), env=env)
-
-    if throw_on_fail:
-        proc.check_returncode()
+    proc = subprocess.run(cmd, cwd=str(nominatim_env.project_dir), env=env,
+                          check=throw_on_fail)
 
     return proc.returncode