Merge remote-tracking branch 'upstream/master'

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

diff --git a/nominatim/clicmd/admin.py b/nominatim/clicmd/admin.py
index 03d7ca8a73e8c55a63f9571dca302f2a4bceff0c..c020e224c1c851e8f21146b7b7b57a358304da39 100644 (file)
--- a/nominatim/clicmd/admin.py
+++ b/nominatim/clicmd/admin.py
@@ -1,10 +1,16 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# This file is part of Nominatim. (https://nominatim.org)
+#
+# Copyright (C) 2022 by the Nominatim developer community.
+# For a full list of authors see the git log.

 """
 Implementation of the 'admin' subcommand.
 """
 import logging
 
 """
 Implementation of the 'admin' subcommand.
 """
 import logging
 

-from ..tools.exec_utils import run_legacy_script
-from ..db.connection import connect
+from nominatim.tools.exec_utils import run_legacy_script
+from nominatim.db.connection import connect

 
 # Do not repeat documentation of subcommand classes.
 # pylint: disable=C0111
 
 # Do not repeat documentation of subcommand classes.
 # pylint: disable=C0111


@@ -23,13 +29,13 @@ class AdminFuncs:
         group = parser.add_argument_group('Admin tasks')
         objs = group.add_mutually_exclusive_group(required=True)
         objs.add_argument('--warm', action='store_true',
         group = parser.add_argument_group('Admin tasks')
         objs = group.add_mutually_exclusive_group(required=True)
         objs.add_argument('--warm', action='store_true',

-                          help='Warm database caches for search and reverse queries.')
+                          help='Warm database caches for search and reverse queries')

         objs.add_argument('--check-database', action='store_true',
         objs.add_argument('--check-database', action='store_true',

-                          help='Check that the database is complete and operational.')
+                          help='Check that the database is complete and operational')

         objs.add_argument('--migrate', action='store_true',
         objs.add_argument('--migrate', action='store_true',

-                          help='Migrate the database to a new software version.')
+                          help='Migrate the database to a new software version')

         objs.add_argument('--analyse-indexing', action='store_true',
         objs.add_argument('--analyse-indexing', action='store_true',

-                          help='Print performance analysis of the indexing process.')
+                          help='Print performance analysis of the indexing process')

         group = parser.add_argument_group('Arguments for cache warming')
         group.add_argument('--search-only', action='store_const', dest='target',
                            const='search',
         group = parser.add_argument_group('Arguments for cache warming')
         group.add_argument('--search-only', action='store_const', dest='target',
                            const='search',