Add deprecation warning to modularity commands/docs

Resolves: RHEL-89940
This commit is contained in:
Evan Goode 2025-07-18 17:32:45 +00:00
parent 40781f6cf6
commit c86d9b262f
3 changed files with 97 additions and 1 deletions

View File

@ -0,0 +1,34 @@
From e3719102eb791fce3189b548aca39ad682fc4157 Mon Sep 17 00:00:00 2001
From: Evan Goode <mail@evangoo.de>
Date: Mon, 14 Jul 2025 17:31:04 +0000
Subject: [PATCH 1/2] Add deprecation warning for module commands
For: https://issues.redhat.com/browse/RHEL-89940
---
dnf/cli/commands/module.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dnf/cli/commands/module.py b/dnf/cli/commands/module.py
index b1396360e..88dc8b23c 100644
--- a/dnf/cli/commands/module.py
+++ b/dnf/cli/commands/module.py
@@ -349,7 +349,7 @@ class ModuleCommand(commands.Command):
SUBCMDS_NOT_REQUIRED_ARG = {ListSubCommand}
aliases = ("module",)
- summary = _("Interact with Modules.")
+ summary = _("Interact with Modules. WARNING: modularity is deprecated, and functionality will be removed in a future release of DNF5.")
def __init__(self, cli):
super(ModuleCommand, self).__init__(cli)
@@ -389,6 +389,7 @@ class ModuleCommand(commands.Command):
help=_("Module specification"))
def configure(self):
+ logger.warning(_("WARNING: modularity is deprecated, and functionality will be removed in a future release of DNF5."))
try:
self.subcmd = self._subcmd_name2obj[self.opts.subcmd[0]]
except (CliError, KeyError):
--
2.50.1

View File

@ -0,0 +1,57 @@
From 031fe5abde80ed724502c15ccee70f54a511a6a7 Mon Sep 17 00:00:00 2001
From: Evan Goode <mail@evangoo.de>
Date: Mon, 14 Jul 2025 17:37:56 +0000
Subject: [PATCH 2/2] Add modularity deprecation warning to doc pages
---
doc/api_module.rst | 2 ++
doc/command_ref.rst | 2 ++
doc/modularity.rst | 3 ++-
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/doc/api_module.rst b/doc/api_module.rst
index e2a5c6a11..6d84e214b 100644
--- a/doc/api_module.rst
+++ b/doc/api_module.rst
@@ -19,6 +19,8 @@
Modularity Interface
=====================
+.. warning:: Modularity is deprecated, and functionality will be removed in a future release of DNF5.
+
.. module:: dnf.module.module_base
diff --git a/doc/command_ref.rst b/doc/command_ref.rst
index f7b8e22c8..4e3077283 100644
--- a/doc/command_ref.rst
+++ b/doc/command_ref.rst
@@ -1025,6 +1025,8 @@ Module Command
| Command: ``module``
+.. warning:: Modularity is deprecated, and functionality will be removed in a future release of DNF5.
+
Modularity overview is available at :ref:`man page dnf.modularity(7) <modularity-label>`.
Module subcommands take :ref:`\<module-spec>\ <specifying_modules-label>`... arguments that specify modules or profiles.
diff --git a/doc/modularity.rst b/doc/modularity.rst
index 8ebd07e23..3683bc608 100644
--- a/doc/modularity.rst
+++ b/doc/modularity.rst
@@ -21,10 +21,11 @@
Modularity
############
+.. warning:: Modularity is deprecated, and functionality will be removed in a future release of DNF5.
+
Modularity is new way of building, organizing and delivering packages.
For more details see: https://docs.pagure.org/modularity/
-
=============
Definitions
=============
--
2.50.1

View File

@ -72,7 +72,7 @@ It supports RPMs, modules and comps groups & environments.
Name: dnf
Version: 4.20.0
Release: 16%{?dist}
Release: 17%{?dist}
Summary: %{pkg_summary}
# For a breakdown of the licensing, see PACKAGE-LICENSING
License: GPL-2.0-or-later AND GPL-1.0-only
@ -111,6 +111,8 @@ Patch30: 0030-Support-globs-in-usr_drift_protected_paths.patch
Patch31: 0031-doc-Document-usr_drift_protected_paths.patch
Patch32: 0032-Load-filelists-if-there-are-any-usr_drift_protected_.patch
Patch33: 0033-Obsolete-RHEL-9-only-multisig-DNF-plugin.patch
Patch34: 0034-Add-deprecation-warning-for-module-commands.patch
Patch35: 0035-Add-modularity-deprecation-warning-to-doc-pages.patch
BuildArch: noarch
BuildRequires: cmake
@ -472,6 +474,9 @@ popd
# bootc subpackage does not include any files
%changelog
* Fri Jul 18 2025 Evan Goode <egoode@redhat.com> - 4.20.0-17
- Add deprecation warning to modularity commands/docs (RHEL-89940)
* Wed Jul 09 2025 Petr Pisar <ppisar@redhat.com> - 4.20.0-16
- Obsolete RHEL-9-only multisig DNF plugin (RHEL-102336)