diff options
Diffstat (limited to 'lib/poptI.c')
| -rw-r--r-- | lib/poptI.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/lib/poptI.c b/lib/poptI.c index 051f0f56f..8272fa80f 100644 --- a/lib/poptI.c +++ b/lib/poptI.c @@ -26,7 +26,7 @@ struct rpmInstallArguments_s rpmIArgs = { RPM_GNUC_NORETURN static void argerror(const char * desc) { - fprintf(stderr, _("%s: %s\n"), __progname, desc); + fprintf(stderr, _("%s: %s\n"), xgetprogname(), desc); exit(EXIT_FAILURE); } @@ -87,6 +87,10 @@ static void installArgCallback( poptContext con, ia->transFlags |= RPMTRANS_FLAG_NOCONTEXTS; break; + case RPMCLI_POPT_NOCAPS: + ia->transFlags |= RPMTRANS_FLAG_NOCAPS; + break; + case RPMCLI_POPT_FORCE: ia->probFilter |= ( RPMPROB_FILTER_REPLACEPKG @@ -181,6 +185,8 @@ struct poptOption rpmInstallPoptTable[] = { N_("don't verify digest of files (obsolete)"), NULL }, { "nocontexts", '\0',0, NULL, RPMCLI_POPT_NOCONTEXTS, N_("don't install file security contexts"), NULL}, + { "nocaps", '\0',0, NULL, RPMCLI_POPT_NOCAPS, + N_("don't install file capabilities"), NULL}, { "noorder", '\0', POPT_BIT_SET, &rpmIArgs.installInterfaceFlags, INSTALL_NOORDER, @@ -224,10 +230,6 @@ struct poptOption rpmInstallPoptTable[] = { &rpmIArgs.transFlags, RPMTRANS_FLAG_NOTRIGGERPOSTUN, N_("do not execute any %%triggerpostun scriptlet(s)"), NULL}, - { "nocollections", '\0', POPT_BIT_SET, - &rpmIArgs.transFlags, RPMTRANS_FLAG_NOCOLLECTIONS, - N_("do not perform any collection actions"), NULL}, - { "oldpackage", '\0', POPT_BIT_SET, &rpmIArgs.probFilter, RPMPROB_FILTER_OLDPACKAGE, N_("upgrade to an old version of the package (--force on upgrades does this automatically)"), @@ -253,6 +255,10 @@ struct poptOption rpmInstallPoptTable[] = { &rpmIArgs.installInterfaceFlags, (INSTALL_UPGRADE|INSTALL_INSTALL), N_("upgrade package(s)"), N_("<packagefile>+") }, + { "reinstall", '\0', POPT_BIT_SET, + &rpmIArgs.installInterfaceFlags, (INSTALL_REINSTALL|INSTALL_INSTALL), + N_("reinstall package(s)"), + N_("<packagefile>+") }, POPT_TABLEEND }; |