Fixed typechecking error

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

diff --git a/nominatim/clicmd/setup.py b/nominatim/clicmd/setup.py
index f9298aacc46ec392a868c77e042af109720b25e3..ca3bf40ed3116ffe7890518511e449b401f1575e 100644 (file)
--- a/nominatim/clicmd/setup.py
+++ b/nominatim/clicmd/setup.py
@@ -71,7 +71,7 @@ class SetupAll:
                             help='Create the database but do not import any data')
 
 
                             help='Create the database but do not import any data')
 
 

-    def run(self, args: NominatimArgs) -> int: # pylint: disable=too-many-statements
+    def run(self, args: NominatimArgs) -> int: # pylint: disable=too-many-statements, too-many-branches

         from ..data import country_info
         from ..tools import database_import, refresh, postcodes, freeze
         from ..indexer.indexer import Indexer
         from ..data import country_info
         from ..tools import database_import, refresh, postcodes, freeze
         from ..indexer.indexer import Indexer


@@ -92,18 +92,18 @@ class SetupAll:
             )
 
 
             )
 
 

+        if args.prepare_database or args.continue_at is None:
+            LOG.warning('Creating database')
+            database_import.setup_database_skeleton(args.config.get_libpq_dsn(),
+                                                        rouser=args.config.DATABASE_WEBUSER)
+            if args.prepare_database:
+                return 0

 
         if args.continue_at in (None, 'import-from-file'):
             files = args.get_osm_file_list()
             if not files and not args.prepare_database:
                 raise UsageError("No input files (use --osm-file).")
 
 
         if args.continue_at in (None, 'import-from-file'):
             files = args.get_osm_file_list()
             if not files and not args.prepare_database:
                 raise UsageError("No input files (use --osm-file).")
 

-            if args.prepare_database or args.continue_at is None:
-                LOG.warning('Creating database')
-                database_import.setup_database_skeleton(args.config.get_libpq_dsn(),
-                                                        rouser=args.config.DATABASE_WEBUSER)
-                return 0
-

             if args.continue_at in ('import-from-file', None):
                 # Check if the correct plugins are installed
                 database_import.check_existing_database_plugins(args.config.get_libpq_dsn())
             if args.continue_at in ('import-from-file', None):
                 # Check if the correct plugins are installed
                 database_import.check_existing_database_plugins(args.config.get_libpq_dsn())