From 7f0abfe05f7291e7e6be1da10938873ec321dca2 Mon Sep 17 00:00:00 2001
From: Jiri Hnidek <jhnidek@redhat.com>
Date: Mon, 10 Jun 2024 11:42:17 +0200
Subject: [PATCH 1/2] fix: [1.29] Remove command should not be primary command

* Card ID: CCT-403
* There is no reason to keep this command as primary command
---
 src/subscription_manager/cli_command/remove.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/subscription_manager/cli_command/remove.py b/src/subscription_manager/cli_command/remove.py
index e7344ed14b..068ebe366d 100644
--- a/src/subscription_manager/cli_command/remove.py
+++ b/src/subscription_manager/cli_command/remove.py
@@ -65,7 +65,11 @@ def _command_name(self):
         return "remove"
 
     def _primary(self):
-        return True
+        """
+        This command is deprecated and no-op. It used to be primary command, but
+        there is no reason to have keep this command as primary command anymore.
+        """
+        return False
 
     def _validate_options(self):
         if self.options.serials:

From 260376e6d89d000739e9f0dd4f0ff1d4b436e19a Mon Sep 17 00:00:00 2001
From: Jiri Hnidek <jhnidek@redhat.com>
Date: Tue, 11 Jun 2024 14:58:25 +0200
Subject: [PATCH 2/2] fix: Reformated man page of subscription-manager

* Card ID: CCT-403
* Fix numbers of the list of commands
* Removed deprecated commands from the list of commands
* Add remove and redeem commands to the list of deprecated
  commands
---
 man/subscription-manager.8 | 40 ++++++++++++++++----------------------
 1 file changed, 17 insertions(+), 23 deletions(-)

diff --git a/man/subscription-manager.8 b/man/subscription-manager.8
index fb49300dbc..16aae9b9fb 100644
--- a/man/subscription-manager.8
+++ b/man/subscription-manager.8
@@ -77,62 +77,56 @@ must be passed as system arguments in a non-interactive session.
 2. unregister
 
 .IP
-5. remove
+3. release
 
 .IP
-6. release
+4. import
 
 .IP
-7. import
+5. list
 
 .IP
-8. redeem
+6. refresh
 
 .IP
-9. list
+7. environments
 
 .IP
-10. refresh
+8. repos
 
 .IP
-11. environments
+9. orgs
 
 .IP
-12. repos
+10. plugins
 
 .IP
-13. orgs
+11. identity
 
 .IP
-14. plugins
+12. facts
 
 .IP
-15. identity
+13. clean
 
 .IP
-16. facts
+14. config
 
 .IP
-17. clean
+15. version
 
 .IP
-18. config
+16. status
 
 .IP
-19. version
+17. syspurpose
 
 .IP
-20. status
-
-.IP
-21. syspurpose
-
-.IP
-22. repo-override
+18. repo-override
 
 .RE
 
-Following commands were deprecated: addons, attach, auto-attach, role, service-level, subscribe, unsubscribe, usage, and activate
+Following commands were deprecated: addons, attach, auto-attach, remove, redeem, role, service-level, subscribe, unsubscribe, usage, and activate
 
 .SS COMMON OPTIONS
 .TP