hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-09 11:34:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed linting errors

Browse Source
This commit is contained in:
Robbe Haesendonck
2023-09-21 09:58:38 +02:00
committed by Sarah Hoffmann
parent 8e71ff329c
commit cc0bdd34e9
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
nominatim/clicmd/setup.py
View File

@@ -84,21 +84,19 @@ class SetupAll:
files = args.get_osm_file_list() files = args.get_osm_file_list()
if not files: if not files:
raise UsageError("No input files (use --osm-file).") raise UsageError("No input files (use --osm-file).")
if args.no_superuser and args.prepare_database: if args.no_superuser and args.prepare_database:
raise UsageError("Cannot use --no-superuser and --prepare-database together.") raise UsageError("Cannot use --no-superuser and --prepare-database together.")
complete_import = not args.no_superuser and not args.prepare_database if args.prepare_database or self.is_complete_import(args):
if args.prepare_database or complete_import:
LOG.warning('Creating database') LOG.warning('Creating database')
database_import.setup_database_skeleton(args.config.get_libpq_dsn(), database_import.setup_database_skeleton(args.config.get_libpq_dsn(),
rouser=args.config.DATABASE_WEBUSER) rouser=args.config.DATABASE_WEBUSER)
if not complete_import: if not self.is_complete_import(args):
return 0 return 0
if not args.prepare_database or args.no_superuser or complete_import: if not args.prepare_database or args.no_superuser or self.is_complete_import(args):
# Check if the correct plugins are installed # Check if the correct plugins are installed
database_import.check_existing_database_plugins(args.config.get_libpq_dsn()) database_import.check_existing_database_plugins(args.config.get_libpq_dsn())
LOG.warning('Setting up country tables') LOG.warning('Setting up country tables')
@@ -172,6 +170,11 @@ class SetupAll:
self._finalize_database(args.config.get_libpq_dsn(), args.offline) self._finalize_database(args.config.get_libpq_dsn(), args.offline)
return 0 return 0
def _is_complete_import(self, args: NominatimArgs) -> bool:
""" Determine if the import is complete or if only the database should be prepared.
"""
return not args.no_superuser and not args.prepare_database
def _setup_tables(self, config: Configuration, reverse_only: bool) -> None: def _setup_tables(self, config: Configuration, reverse_only: bool) -> None:

1
nominatim/tools/database_import.py
View File

@@ -39,6 +39,7 @@ def _require_version(module: str, actual: Tuple[int, int], expected: Tuple[int,
def check_existing_database_plugins(dsn: str): def check_existing_database_plugins(dsn: str):
""" Check that the database has the required plugins installed."""
with connect(dsn) as conn: with connect(dsn) as conn:
_require_version('PostgreSQL server', _require_version('PostgreSQL server',
conn.server_version_tuple(), conn.server_version_tuple(),