Merge remote-tracking branch 'upstream/master'

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

diff --git a/nominatim/clicmd/setup.py b/nominatim/clicmd/setup.py
index 3d04a57a35c7b4da984d8b14473f58e624924122..a3fbb84610172815a5befca3818c51b5749814e8 100644 (file)
--- a/nominatim/clicmd/setup.py
+++ b/nominatim/clicmd/setup.py
@@ -55,6 +55,8 @@ class SetupAll:
         from ..tools import database_import, refresh, postcodes, freeze, country_info
         from ..indexer.indexer import Indexer
 
+        country_info.setup_country_config(args.config)
+
         if args.continue_at is None:
             files = args.get_osm_file_list()
 
@@ -115,7 +117,6 @@ class SetupAll:
             LOG.warning('Create search index for default country names.')
             country_info.create_country_names(conn, tokenizer,
                                               args.config.LANGUAGES)
-            conn.commit()
             if args.no_updates:
                 freeze.drop_update_tables(conn)
         tokenizer.finalize_import(args.config)