X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/567c31ab6a9a9edfa8cc902bec4004c1e0c25339..b6c8c0e72bdd76a8214fc360cfeaf9188c17d8b1:/nominatim/clicmd/setup.py diff --git a/nominatim/clicmd/setup.py b/nominatim/clicmd/setup.py index d4b5777e..3d212ff9 100644 --- a/nominatim/clicmd/setup.py +++ b/nominatim/clicmd/setup.py @@ -92,19 +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: + if not files: 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) - if args.prepare_database: - 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())