diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2010-11-15 09:07:10 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2010-11-15 09:07:10 +0200 |
| commit | 0600287d5d9cf1fd36ab5400d92be9c90b676e82 (patch) | |
| tree | 09289874bf164e929a495608b2dc7e3252b34b56 /rpmkeys.c | |
| parent | 949d16b6db0ac5498cb2d3715854ee3cee16fd3c (diff) | |
| download | librpm-tizen-0600287d5d9cf1fd36ab5400d92be9c90b676e82.tar.gz librpm-tizen-0600287d5d9cf1fd36ab5400d92be9c90b676e82.tar.bz2 librpm-tizen-0600287d5d9cf1fd36ab5400d92be9c90b676e82.zip | |
Rearrange new cli utilities' popt tables for nicer output
- Use a separate table for the tool-specific options, include that from
the "master" option table to get option group summary in --help.
Diffstat (limited to 'rpmkeys.c')
| -rw-r--r-- | rpmkeys.c | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -18,9 +18,7 @@ enum modes { static int mode = 0; -static struct poptOption optionsTable[] = { - { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmcliAllPoptTable, 0, - N_("Common options for all rpm modes and executables:"), NULL }, +static struct poptOption keyOptsTable[] = { { "checksig", 'K', (POPT_ARG_VAL|POPT_ARGFLAG_OR), &mode, MODE_CHECKSIG, N_("verify package signature(s)"), NULL }, { "import", '\0', (POPT_ARG_VAL|POPT_ARGFLAG_OR), &mode, MODE_IMPORTKEY, @@ -31,6 +29,14 @@ static struct poptOption optionsTable[] = { { "list-keys", '\0', (POPT_ARG_VAL|POPT_ARGFLAG_OR), &mode, MODE_LISTKEY, N_("list keys from RPM keyring"), NULL }, #endif + POPT_TABLEEND +}; + +static struct poptOption optionsTable[] = { + { NULL, '\0', POPT_ARG_INCLUDE_TABLE, keyOptsTable, 0, + N_("Keyring options:"), NULL }, + { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmcliAllPoptTable, 0, + N_("Common options for all rpm modes and executables:"), NULL }, POPT_AUTOALIAS POPT_AUTOHELP |