Skip to content

Commit f777d26

Browse files
konturadcantrell
kontura
authored and
dcantrell
committed
Usage help: don't mark mandatory option parameters as optional
For: https://issues.redhat.com/browse/RHEL-63958
1 parent 6a88814 commit f777d26

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

‎dnf/cli/commands/repoquery.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ def set_argparser(parser):
126126
parser.add_argument('--show-duplicates', action='store_true',
127127
help=_("Query all versions of packages (default)"))
128128
parser.add_argument('--arch', '--archlist', dest='arches', default=[],
129-
action=_CommaSplitCallback, metavar='[arch]',
129+
action=_CommaSplitCallback, metavar='ARCH',
130130
help=_('show only results from this ARCH'))
131131
parser.add_argument('-f', '--file', metavar='FILE', nargs='+',
132132
help=_('show only results that owns FILE'))

‎dnf/cli/option_parser.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ def _add_general_options(self):
171171
general_grp = self.add_argument_group(_('General {prog} options'.format(
172172
prog=dnf.util.MAIN_PROG_UPPER)))
173173
general_grp.add_argument("-c", "--config", dest="config_file_path",
174-
default=None, metavar='[config file]',
174+
default=None, metavar='CONFIG_FILE',
175175
help=_("config file location"))
176176
general_grp.add_argument("-q", "--quiet", dest="quiet",
177177
action="store_true", default=None,
@@ -182,7 +182,7 @@ def _add_general_options(self):
182182
help=_("show {prog} version and exit").format(
183183
prog=dnf.util.MAIN_PROG_UPPER))
184184
general_grp.add_argument("--installroot", help=_("set install root"),
185-
metavar='[path]')
185+
metavar='PATH]')
186186
general_grp.add_argument("--nodocs", action="store_const", const=['nodocs'], dest='tsflags',
187187
help=_("do not install documentations"))
188188
general_grp.add_argument("--noplugins", action="store_false",
@@ -191,11 +191,11 @@ def _add_general_options(self):
191191
general_grp.add_argument("--enableplugin", dest="enableplugin",
192192
default=[], action=self._SplitCallback,
193193
help=_("enable plugins by name"),
194-
metavar='[plugin]')
194+
metavar='PLUGIN]')
195195
general_grp.add_argument("--disableplugin", dest="disableplugin",
196196
default=[], action=self._SplitCallback,
197197
help=_("disable plugins by name"),
198-
metavar='[plugin]')
198+
metavar='PLUGIN]')
199199
general_grp.add_argument("--releasever", default=None,
200200
help=_("override the value of $releasever"
201201
" in config and repo files"))
@@ -229,10 +229,10 @@ def _add_general_options(self):
229229
help=_("run entirely from system cache, "
230230
"don't update cache"))
231231
general_grp.add_argument("-R", "--randomwait", dest="sleeptime", type=int,
232-
default=None, metavar='[minutes]',
232+
default=None, metavar='MINUTES',
233233
help=_("maximum command wait time"))
234234
general_grp.add_argument("-d", "--debuglevel", dest="debuglevel",
235-
metavar='[debug level]', default=None,
235+
metavar='DEBUG_LEVEL', default=None,
236236
help=_("debugging output level"), type=int)
237237
general_grp.add_argument("--debugsolver",
238238
action="store_true", default=None,
@@ -252,28 +252,28 @@ def _add_general_options(self):
252252
"repoquery").format(prog=dnf.util.MAIN_PROG))
253253
general_grp.add_argument("--rpmverbosity", default=None,
254254
help=_("debugging output level for rpm"),
255-
metavar='[debug level name]')
255+
metavar='DEBUG_LEVEL_NAME')
256256
general_grp.add_argument("-y", "--assumeyes", action="store_true",
257257
default=None, help=_("automatically answer yes"
258258
" for all questions"))
259259
general_grp.add_argument("--assumeno", action="store_true",
260260
default=None, help=_("automatically answer no"
261261
" for all questions"))
262262
general_grp.add_argument("--enablerepo", action=self._RepoCallback,
263-
dest='repos_ed', default=[], metavar='[repo]',
263+
dest='repos_ed', default=[], metavar='REPO',
264264
help=_("Temporarily enable repositories for the purpose "
265265
"of the current dnf command. Accepts an id, a "
266266
"comma-separated list of ids, or a glob of ids. "
267267
"This option can be specified multiple times."))
268268
repo_group = general_grp.add_mutually_exclusive_group()
269269
repo_group.add_argument("--disablerepo", action=self._RepoCallback,
270-
dest='repos_ed', default=[], metavar='[repo]',
270+
dest='repos_ed', default=[], metavar='REPO',
271271
help=_("Temporarily disable active repositories for the "
272272
"purpose of the current dnf command. Accepts an id, "
273273
"a comma-separated list of ids, or a glob of ids. "
274274
"This option can be specified multiple times, but "
275275
"is mutually exclusive with `--repo`."))
276-
repo_group.add_argument('--repo', '--repoid', metavar='[repo]', dest='repo',
276+
repo_group.add_argument('--repo', '--repoid', metavar='REPO', dest='repo',
277277
action=self._SplitCallback, default=[],
278278
help=_('enable just specific repositories by an id or a glob, '
279279
'can be specified multiple times'))
@@ -289,15 +289,15 @@ def _add_general_options(self):
289289
general_grp.add_argument("-x", "--exclude", "--excludepkgs", default=[],
290290
dest='excludepkgs', action=self._SplitCallback,
291291
help=_("exclude packages by name or glob"),
292-
metavar='[package]')
292+
metavar='PACKAGE')
293293
general_grp.add_argument("--disableexcludes", "--disableexcludepkgs",
294294
default=[], dest="disable_excludes",
295295
action=self._SplitCallback,
296296
help=_("disable excludepkgs"),
297-
metavar='[repo]')
297+
metavar='{all, main, REPOID}')
298298
general_grp.add_argument("--repofrompath", default={},
299299
action=self._SplitExtendDictCallback,
300-
metavar='[repo,path]',
300+
metavar='REPO,PATH',
301301
help=_("label and path to an additional repository to use (same "
302302
"path as in a baseurl), can be specified multiple times."))
303303
general_grp.add_argument("--noautoremove", action="store_false",

0 commit comments

Comments
 (0)