From e4d584e6f1a48147018010dc5784afb2b236b41b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= Date: Fri, 2 May 2025 06:37:26 +0200 Subject: [PATCH] man page: don't mark mandatory option parameters as optional Resolves: RHEL-63958 --- ...-typo-from-previous-commit-left-over.patch | 39 +++++++++++++++++++ ...and-disableexcludepkgs-values-are-no.patch | 26 +++++++++++++ dnf.spec | 7 +++- 3 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 0047-Fix-typo-from-previous-commit-left-over.patch create mode 100644 0048-disableexcludes-and-disableexcludepkgs-values-are-no.patch diff --git a/0047-Fix-typo-from-previous-commit-left-over.patch b/0047-Fix-typo-from-previous-commit-left-over.patch new file mode 100644 index 0000000..80c3b18 --- /dev/null +++ b/0047-Fix-typo-from-previous-commit-left-over.patch @@ -0,0 +1,39 @@ +From d2d3770168e744eeace6c36b38f4ba0709c7b9c0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= +Date: Mon, 28 Apr 2025 12:23:27 +0200 +Subject: [PATCH 1/2] Fix typo from previous commit (left over `]`) + +--- + dnf/cli/option_parser.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/dnf/cli/option_parser.py b/dnf/cli/option_parser.py +index a23c8553..6bb32c51 100644 +--- a/dnf/cli/option_parser.py ++++ b/dnf/cli/option_parser.py +@@ -185,7 +185,7 @@ class OptionParser(argparse.ArgumentParser): + help=_("show {prog} version and exit").format( + prog=dnf.util.MAIN_PROG_UPPER)) + general_grp.add_argument("--installroot", help=_("set install root"), +- metavar='PATH]') ++ metavar='PATH') + general_grp.add_argument("--nodocs", action="store_const", const=['nodocs'], dest='tsflags', + help=_("do not install documentations")) + general_grp.add_argument("--noplugins", action="store_false", +@@ -194,11 +194,11 @@ class OptionParser(argparse.ArgumentParser): + general_grp.add_argument("--enableplugin", dest="enableplugin", + default=[], action=self._SplitCallback, + help=_("enable plugins by name"), +- metavar='PLUGIN]') ++ metavar='PLUGIN') + general_grp.add_argument("--disableplugin", dest="disableplugin", + default=[], action=self._SplitCallback, + help=_("disable plugins by name"), +- metavar='PLUGIN]') ++ metavar='PLUGIN') + general_grp.add_argument("--releasever", default=None, + help=_("override the value of $releasever" + " in config and repo files")) +-- +2.48.1 + diff --git a/0048-disableexcludes-and-disableexcludepkgs-values-are-no.patch b/0048-disableexcludes-and-disableexcludepkgs-values-are-no.patch new file mode 100644 index 0000000..daa4e26 --- /dev/null +++ b/0048-disableexcludes-and-disableexcludepkgs-values-are-no.patch @@ -0,0 +1,26 @@ +From 0f37439d04cfa6f2b39d3602b1b40570d37af80f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= +Date: Mon, 28 Apr 2025 12:41:13 +0200 +Subject: [PATCH 2/2] `--disableexcludes` and `--disableexcludepkgs` values are + not optional + +--- + doc/command_ref.rst | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/command_ref.rst b/doc/command_ref.rst +index 8b55d5a7..30627bd4 100644 +--- a/doc/command_ref.rst ++++ b/doc/command_ref.rst +@@ -164,7 +164,7 @@ Options + + .. _disableexcludes-label: + +-``--disableexcludes=[all|main|], --disableexcludepkgs=[all|main|]`` ++``--disableexcludes={all|main|}, --disableexcludepkgs={all|main|}`` + Disable ``excludepkgs`` and ``includepkgs`` configuration options. Takes one of the following three options: + + * ``all``, disables all ``excludepkgs`` and ``includepkgs`` configurations +-- +2.48.1 + diff --git a/dnf.spec b/dnf.spec index 40ddb34..879c267 100644 --- a/dnf.spec +++ b/dnf.spec @@ -73,7 +73,7 @@ It supports RPMs, modules and comps groups & environments. Name: dnf Version: 4.14.0 -Release: 28%{?dist} +Release: 29%{?dist} Summary: %{pkg_summary} # For a breakdown of the licensing, see PACKAGE-LICENSING License: GPLv2+ @@ -125,6 +125,8 @@ Patch43: 0043-spec-Add-dnf-bootc-subpackage.patch Patch44: 0044-Require-libdnf-0.74.0-with-persistence-option.patch Patch45: 0045-package-remote_location-takes-basedir-into-account.patch Patch46: 0046-Usage-help-don-t-mark-mandatory-option-parameters-as.patch +Patch47: 0047-Fix-typo-from-previous-commit-left-over.patch +Patch48: 0048-disableexcludes-and-disableexcludepkgs-values-are-no.patch BuildArch: noarch BuildRequires: cmake @@ -430,6 +432,9 @@ popd # bootc subpackage does not include any files %changelog +* Fri May 02 2025 Ales Matej - 4.14.0-27 +- man page: don't mark mandatory option parameters as optional (RHEL-63958) + * Fri Apr 04 2025 Evan Goode - 4.14.0-28 - Add dnf4 provides and symlink /usr/bin/dnf4 -> /usr/bin/dnf-3 (RHEL-82310)