Merge remote-tracking branch 'upstream/master'

[nominatim.git] / nominatim / clicmd / freeze.py

diff --git a/nominatim/clicmd/freeze.py b/nominatim/clicmd/freeze.py
index 8bca04b995f1240782ab27c92e4326db2f1ad9f3..85eb1b4a1730e9070956ee4d900aa91a9f3c4f8c 100644 (file)
--- a/nominatim/clicmd/freeze.py
+++ b/nominatim/clicmd/freeze.py
@@ -1,8 +1,14 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# This file is part of Nominatim. (https://nominatim.org)
+#
+# Copyright (C) 2022 by the Nominatim developer community.
+# For a full list of authors see the git log.

 """
 Implementation of the 'freeze' subcommand.
 """
 
 """
 Implementation of the 'freeze' subcommand.
 """
 

-from ..db.connection import connect
+from nominatim.db.connection import connect

 
 # Do not repeat documentation of subcommand classes.
 # pylint: disable=C0111
 
 # Do not repeat documentation of subcommand classes.
 # pylint: disable=C0111


@@ -29,9 +35,8 @@ class SetupFreeze:
     def run(args):
         from ..tools import freeze
 
     def run(args):
         from ..tools import freeze
 

-        conn = connect(args.config.get_libpq_dsn())
-        freeze.drop_update_tables(conn)
-        freeze.drop_flatnode_file(args.config.FLATNODE_FILE)
-        conn.close()
+        with connect(args.config.get_libpq_dsn()) as conn:
+            freeze.drop_update_tables(conn)
+        freeze.drop_flatnode_file(str(args.config.get_path('FLATNODE_FILE')))

 
         return 0
 
         return 0