6c2a5fa538
- Resolves: RHEL-49452 Include latest fixes in python3-ipatests packages - Resolves: RHEL-49433 Adjust "ipa config-mod --addattr ipaconfigstring=EnforceLDAPOTP" to allow for non OTP users in some cases - Resolves: RHEL-49432 ipa-migrate stage-mode is failing with error: Modifying a mapped attribute in a managed entry is not allowed - Resolves: RHEL-49413 ipa-migrate with -Z option fails with ValueError: option error - Resolves: RHEL-47157 ipa-migrate -V options fails to display version - Resolves: RHEL-47148 Pagure #9629: Syntax error uninstalling the selinux-luna subpackage - Resolves: RHEL-40892 ipa-server-install: token_password_file read in kra.install_check after calling hsm_validator in ca.install_check Signed-off-by: Florence Blanc-Renaud <flo@redhat.com>
48 lines
2.0 KiB
Diff
48 lines
2.0 KiB
Diff
From efa57193630f244185b3f295ed0de17c6d08f75a Mon Sep 17 00:00:00 2001
|
|
From: Mark Reynolds <mreynolds@redhat.com>
|
|
Date: Mon, 8 Jul 2024 10:49:49 -0400
|
|
Subject: [PATCH] ipa-migrate - remove -V option
|
|
|
|
The versioning in ipa-migrate was removed, but the "-V" option to display the version was not removed.
|
|
|
|
Fixes: https://pagure.io/freeipa/issue/9620
|
|
|
|
Signed-off-by: Mark Reynolds <mreynolds@redhat.com>
|
|
Reviewed-By: Rob Crittenden <rcritten@redhat.com>
|
|
---
|
|
install/tools/man/ipa-migrate.1 | 3 ---
|
|
ipaserver/install/ipa_migrate.py | 3 ---
|
|
2 files changed, 6 deletions(-)
|
|
|
|
diff --git a/install/tools/man/ipa-migrate.1 b/install/tools/man/ipa-migrate.1
|
|
index 78881d1f8a9ea91d7824e5f8b13f50aecf5ebd16..2d9d2c650a4c44a2f397d1c2ccb42fb95eea2bae 100644
|
|
--- a/install/tools/man/ipa-migrate.1
|
|
+++ b/install/tools/man/ipa-migrate.1
|
|
@@ -67,9 +67,6 @@ Reset the ID range for migrated users/groups. In "stage-mode" this is done autom
|
|
\fB\-F\fR, \fB\-\-force\fR
|
|
Ignore any errors and continue to proceed with migration effort.
|
|
.TP
|
|
-\fB\-V\fR, \fB\-\-version\fR
|
|
-Display the version of the migration tool.
|
|
-.TP
|
|
\fB\-q\fR, \fB\-\-quiet\fR
|
|
Only log errors during the migration process.
|
|
.TP
|
|
diff --git a/ipaserver/install/ipa_migrate.py b/ipaserver/install/ipa_migrate.py
|
|
index 58351af604b8d6f4ac31432a425718a4d45e0178..6be8d9ba23b36779bf6296df757c1aca551968c0 100644
|
|
--- a/ipaserver/install/ipa_migrate.py
|
|
+++ b/ipaserver/install/ipa_migrate.py
|
|
@@ -389,9 +389,6 @@ class IPAMigrate():
|
|
parser.add_argument('-F', '--force',
|
|
help='Ignore errors and continue with migration',
|
|
action='store_true', default=False)
|
|
- parser.add_argument('-V', '--version',
|
|
- help='Display verison of the migration tool',
|
|
- action='store_true', default=False)
|
|
parser.add_argument('-q', '--quiet',
|
|
help='Only display errors during the migration',
|
|
action='store_true', default=False)
|
|
--
|
|
2.45.2
|
|
|