X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/7d28fc35d1c662c675d5475143fe005f7d2c61b8..53d2050dc5deb0a21fb25ede46ad4194ef5f410d:/nominatim/clicmd/setup.py diff --git a/nominatim/clicmd/setup.py b/nominatim/clicmd/setup.py index 1a38b3a6..ca3bf40e 100644 --- a/nominatim/clicmd/setup.py +++ b/nominatim/clicmd/setup.py @@ -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.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())