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 9a7b92e6c4216b1b38716373bccb9f8c62e44bed..9557dc988c94712f446f8c21c8f167d69639747f 100644 (file)
--- a/nominatim/clicmd/admin.py
+++ b/nominatim/clicmd/admin.py
@@ -29,7 +29,6 @@ class AdminFuncs:
     """
 
     def add_args(self, parser: argparse.ArgumentParser) -> None:
-        self.parser = parser
         group = parser.add_argument_group('Admin tasks')
         objs = group.add_mutually_exclusive_group(required=True)
         objs.add_argument('--warm', action='store_true',
@@ -42,7 +41,7 @@ class AdminFuncs:
                           help='Print performance analysis of the indexing process')
         objs.add_argument('--collect-os-info', action="store_true",
                           help="Generate a report about the host system information")
-        objs.add_argument('--clean-deleted', action='store_true',
+        objs.add_argument('--clean-deleted', action='store', metavar='AGE',
                           help='Clean up deleted relations')
         group = parser.add_argument_group('Arguments for cache warming')
         group.add_argument('--search-only', action='store_const', dest='target',
@@ -57,9 +56,6 @@ class AdminFuncs:
                             help='Analyse indexing of the given OSM object')
         mgroup.add_argument('--place-id', type=int,
                             help='Analyse indexing of the given Nominatim object')
-        group = parser.add_argument_group('Arguments for cleaning deleted')
-        group.add_argument('--age', type=str,
-                           help='Delete relations older than the given PostgreSQL time interval')
 
 
     def run(self, args: NominatimArgs) -> int:
@@ -90,11 +86,9 @@ class AdminFuncs:
             return 0
 
         if args.clean_deleted:
-            if not args.age:
-                self.parser.error('Age is required for --clean-deleted command')
             LOG.warning('Cleaning up deleted relations')
             from ..tools import admin
-            admin.clean_deleted_relations(args.config, age=args.age)
+            admin.clean_deleted_relations(args.config, age=args.clean_deleted)
             return 0
 
         return 1