rpms/dnf
6
0
Fork 0
Code Issues Pull Requests Releases Activity

usage help: don't mark mandatory option parameters as optional

Browse Source 
Resolves: RHEL-63958
This commit is contained in:
Aleš Matěj 2025-03-07 13:19:46 +01:00
parent edd90e7183
commit 267f870392
2 changed files with 134 additions and 1 deletions

129
0046-Usage-help-don-t-mark-mandatory-option-parameters-as.patch Normal file
View File

@ -0,0 +1,129 @@
From f777d26ba70778ff015a3f3af21f76e5a1e8473b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>
Date: Tue, 11 Feb 2025 14:33:08 +0100
Subject: [PATCH] Usage help: don't mark mandatory option parameters as
optional
For: https://issues.redhat.com/browse/RHEL-63958
---
dnf/cli/commands/repoquery.py | 2 +-
dnf/cli/option_parser.py | 26 +++++++++++++-------------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/dnf/cli/commands/repoquery.py b/dnf/cli/commands/repoquery.py
index 41dd688e..a5e55122 100644
--- a/dnf/cli/commands/repoquery.py
+++ b/dnf/cli/commands/repoquery.py
@@ -126,7 +126,7 @@ class RepoQueryCommand(commands.Command):
parser.add_argument('--show-duplicates', action='store_true',
help=_("Query all versions of packages (default)"))
parser.add_argument('--arch', '--archlist', dest='arches', default=[],
- action=_CommaSplitCallback, metavar='[arch]',
+ action=_CommaSplitCallback, metavar='ARCH',
help=_('show only results from this ARCH'))
parser.add_argument('-f', '--file', metavar='FILE', nargs='+',
help=_('show only results that owns FILE'))
diff --git a/dnf/cli/option_parser.py b/dnf/cli/option_parser.py
index fba37614..c95d3d99 100644
--- a/dnf/cli/option_parser.py
+++ b/dnf/cli/option_parser.py
@@ -171,7 +171,7 @@ class OptionParser(argparse.ArgumentParser):
general_grp = self.add_argument_group(_('General {prog} options'.format(
prog=dnf.util.MAIN_PROG_UPPER)))
general_grp.add_argument("-c", "--config", dest="config_file_path",
- default=None, metavar='[config file]',
+ default=None, metavar='CONFIG_FILE',
help=_("config file location"))
general_grp.add_argument("-q", "--quiet", dest="quiet",
action="store_true", default=None,
@@ -182,7 +182,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",
@@ -191,11 +191,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"))
@@ -229,10 +229,10 @@ class OptionParser(argparse.ArgumentParser):
help=_("run entirely from system cache, "
"don't update cache"))
general_grp.add_argument("-R", "--randomwait", dest="sleeptime", type=int,
- default=None, metavar='[minutes]',
+ default=None, metavar='MINUTES',
help=_("maximum command wait time"))
general_grp.add_argument("-d", "--debuglevel", dest="debuglevel",
- metavar='[debug level]', default=None,
+ metavar='DEBUG_LEVEL', default=None,
help=_("debugging output level"), type=int)
general_grp.add_argument("--debugsolver",
action="store_true", default=None,
@@ -252,7 +252,7 @@ class OptionParser(argparse.ArgumentParser):
"repoquery").format(prog=dnf.util.MAIN_PROG))
general_grp.add_argument("--rpmverbosity", default=None,
help=_("debugging output level for rpm"),
- metavar='[debug level name]')
+ metavar='DEBUG_LEVEL_NAME')
general_grp.add_argument("-y", "--assumeyes", action="store_true",
default=None, help=_("automatically answer yes"
" for all questions"))
@@ -260,20 +260,20 @@ class OptionParser(argparse.ArgumentParser):
default=None, help=_("automatically answer no"
" for all questions"))
general_grp.add_argument("--enablerepo", action=self._RepoCallback,
- dest='repos_ed', default=[], metavar='[repo]',
+ dest='repos_ed', default=[], metavar='REPO',
help=_("Temporarily enable repositories for the purpose "
"of the current dnf command. Accepts an id, a "
"comma-separated list of ids, or a glob of ids. "
"This option can be specified multiple times."))
repo_group = general_grp.add_mutually_exclusive_group()
repo_group.add_argument("--disablerepo", action=self._RepoCallback,
- dest='repos_ed', default=[], metavar='[repo]',
+ dest='repos_ed', default=[], metavar='REPO',
help=_("Temporarily disable active repositories for the "
"purpose of the current dnf command. Accepts an id, "
"a comma-separated list of ids, or a glob of ids. "
"This option can be specified multiple times, but "
"is mutually exclusive with `--repo`."))
- repo_group.add_argument('--repo', '--repoid', metavar='[repo]', dest='repo',
+ repo_group.add_argument('--repo', '--repoid', metavar='REPO', dest='repo',
action=self._SplitCallback, default=[],
help=_('enable just specific repositories by an id or a glob, '
'can be specified multiple times'))
@@ -289,15 +289,15 @@ class OptionParser(argparse.ArgumentParser):
general_grp.add_argument("-x", "--exclude", "--excludepkgs", default=[],
dest='excludepkgs', action=self._SplitCallback,
help=_("exclude packages by name or glob"),
- metavar='[package]')
+ metavar='PACKAGE')
general_grp.add_argument("--disableexcludes", "--disableexcludepkgs",
default=[], dest="disable_excludes",
action=self._SplitCallback,
help=_("disable excludepkgs"),
- metavar='[repo]')
+ metavar='{all, main, REPOID}')
general_grp.add_argument("--repofrompath", default={},
action=self._SplitExtendDictCallback,
- metavar='[repo,path]',
+ metavar='REPO,PATH',
help=_("label and path to an additional repository to use (same "
"path as in a baseurl), can be specified multiple times."))
general_grp.add_argument("--noautoremove", action="store_false",
--
2.48.1

6
dnf.spec
View File

@ -73,7 +73,7 @@ It supports RPMs, modules and comps groups & environments.
Name: dnf
Version: 4.14.0
Release: 26%{?dist}
Release: 27%{?dist}
Summary: %{pkg_summary}
# For a breakdown of the licensing, see PACKAGE-LICENSING
License: GPLv2+
@ -124,6 +124,7 @@ Patch42: 0042-bootc-Re-locking-use-ostree-admin-unlock-transient.patch
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
BuildArch: noarch
BuildRequires: cmake
@ -426,6 +427,9 @@ popd
# bootc subpackage does not include any files
%changelog
* Fri Mar 07 2025 Ales Matej <amatej@redhat.com> - 4.14.0-27
- usage help: don't mark mandatory option parameters as optional (RHEL-63958)
* Fri Mar 07 2025 Marek Blaha <mblaha@redhat.com> - 4.14.0-26
- package: remote_location() takes basedir into account (RHEL-71125)