From e3c89357e035740f5344427d7322f2626e287ca2 Mon Sep 17 00:00:00 2001
From: Chad Smith <chad.smith@canonical.com>
Date: Wed, 2 Oct 2024 14:35:57 -0600
Subject: [PATCH] Revert "chore: Deprecate old commands in help output (#5595)"

This reverts commit bd6cd1fbee12ac81ff6c46cc5f979cfdf76e5e13.
---
 cloudinit/cmd/main.py | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/cloudinit/cmd/main.py b/cloudinit/cmd/main.py
index 2322504609bb..c3ca811d83ff 100644
--- a/cloudinit/cmd/main.py
+++ b/cloudinit/cmd/main.py
@@ -938,17 +938,14 @@ def main(sysv_args=None):
         "--debug",
         "-d",
         action="store_true",
-        help=(
-            "DEPRECATED: Show additional pre-action "
-            "logging (default: %(default)s)."
-        ),
+        help="Show additional pre-action logging (default: %(default)s).",
         default=False,
     )
     parser.add_argument(
         "--force",
         action="store_true",
         help=(
-            "DEPRECATED: Force running even if no datasource is"
+            "Force running even if no datasource is"
             " found (use at your own risk)."
         ),
         dest="force",
@@ -971,10 +968,7 @@ def main(sysv_args=None):
 
     # Each action and its sub-options (if any)
     parser_init = subparsers.add_parser(
-        "init",
-        help=(
-            "DEPRECATED: Initialize cloud-init and perform initial modules."
-        ),
+        "init", help="Initialize cloud-init and perform initial modules."
     )
     parser_init.add_argument(
         "--local",
@@ -997,8 +991,7 @@ def main(sysv_args=None):
 
     # These settings are used for the 'config' and 'final' stages
     parser_mod = subparsers.add_parser(
-        "modules",
-        help=("DEPRECATED: Activate modules using a given configuration key."),
+        "modules", help="Activate modules using a given configuration key."
     )
     extra_help = lifecycle.deprecate(
         deprecated="`init`",
@@ -1029,11 +1022,7 @@ def main(sysv_args=None):
 
     # This subcommand allows you to run a single module
     parser_single = subparsers.add_parser(
-        "single",
-        help=(
-            "Manually run a single module. Useful for "
-            "testing during development."
-        ),
+        "single", help="Run a single module."
     )
     parser_single.add_argument(
         "--name",