[elbe-devel] [PATCH 02/10] elbepack: cli: move deprecated arguments to elbepack.cli

[Thomas Weißschuh]

This newer package is a better fit.
While at it, also allow deprecated decorator arguments.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh at linutronix.de>
---
 elbepack/cli.py               | 13 +++++++++++++
 elbepack/commands/__init__.py | 17 -----------------
 elbepack/commands/initvm.py   |  3 +--
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/elbepack/cli.py b/elbepack/cli.py
index bace38acbdfdf25e55fa7cc2e4b8281cc29fbec6..055bc98cf493db3ab213763883ee3ae59c4ab10e 100644
--- a/elbepack/cli.py
+++ b/elbepack/cli.py
@@ -2,9 +2,11 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 # SPDX-FileCopyrightText: 2024 Linutronix GmbH
 
+import argparse
 import dataclasses
 import inspect
 import os.path
+import sys
 import traceback
 import types
 import typing
@@ -53,6 +55,17 @@ def add_arguments_from_decorated_function(parser, f):
         parser.add_argument(*args, **kwargs)
 
 
+class _DeprecatedArgumentAction(argparse.Action):
+    def __call__(self, parser, namespace, values, option_string):
+        print(f'Deprecated option "{option_string}" was used. This option is a NOOP.',
+              file=sys.stderr)
+
+
+def add_deprecated_argparse_argument(parser_or_func, *args, **kwargs):
+    return add_argument(parser_or_func, *args, **kwargs,
+                        action=_DeprecatedArgumentAction, help=argparse.SUPPRESS)
+
+
 @dataclasses.dataclass
 class _CliDetails:
     message: str
diff --git a/elbepack/commands/__init__.py b/elbepack/commands/__init__.py
index b0dfe845aa9aed50d977f674805d01dd9961d8e2..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/elbepack/commands/__init__.py
+++ b/elbepack/commands/__init__.py
@@ -1,17 +0,0 @@
-# ELBE - Debian Based Embedded Rootfilesystem Builder
-# SPDX-License-Identifier: GPL-3.0-or-later
-# SPDX-FileCopyrightText: 2024 Linutronix GmbH
-
-import argparse
-import sys
-
-
-class _DeprecatedArgumentAction(argparse.Action):
-    def __call__(self, parser, namespace, values, option_string):
-        print(f'Deprecated option "{option_string}" was used. This option is a NOOP.',
-              file=sys.stderr)
-
-
-def add_deprecated_argparse_argument(parser, *args, **kwargs):
-    parser.add_argument(*args, **kwargs, action=_DeprecatedArgumentAction,
-                        help=argparse.SUPPRESS)
diff --git a/elbepack/commands/initvm.py b/elbepack/commands/initvm.py
index b6005696ff79ac78f30d57f8715c1f73e8bff676..bb994374085c7eb86a91b25663b7a14f91802a91 100644
--- a/elbepack/commands/initvm.py
+++ b/elbepack/commands/initvm.py
@@ -6,8 +6,7 @@ import argparse
 import datetime
 import os
 
-from elbepack.cli import add_arguments_from_decorated_function
-from elbepack.commands import add_deprecated_argparse_argument
+from elbepack.cli import add_arguments_from_decorated_function, add_deprecated_argparse_argument
 from elbepack.commands.preprocess import add_xmlpreprocess_passthrough_arguments
 from elbepack.initvmaction import initvm_actions
 

-- 
2.48.1