diff options
Diffstat (limited to 'lib/poptI.c')
| -rw-r--r-- | lib/poptI.c | 45 |
1 files changed, 11 insertions, 34 deletions
diff --git a/lib/poptI.c b/lib/poptI.c index 07a90c77f..d8c41e2de 100644 --- a/lib/poptI.c +++ b/lib/poptI.c @@ -147,8 +147,7 @@ struct poptOption rpmInstallPoptTable[] = { installArgCallback, 0, NULL, NULL }, /*@=type@*/ - { "aid", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN, - &rpmIArgs.transFlags, RPMTRANS_FLAG_ADDINDEPS, + { "aid", '\0', POPT_BIT_SET, &rpmIArgs.transFlags, RPMTRANS_FLAG_ADDINDEPS, N_("add suggested packages to transaction"), NULL }, { "allfiles", '\0', POPT_BIT_SET, @@ -174,6 +173,9 @@ struct poptOption rpmInstallPoptTable[] = { { "erase", 'e', POPT_BIT_SET, &rpmIArgs.installInterfaceFlags, INSTALL_ERASE, N_("erase (uninstall) package"), N_("<package>+") }, + { "excludeconfigs", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN, + &rpmIArgs.transFlags, RPMTRANS_FLAG_NOCONFIGS, + N_("do not install configuration files"), NULL}, { "excludedocs", '\0', POPT_BIT_SET, &rpmIArgs.transFlags, RPMTRANS_FLAG_NODOCS, N_("do not install documentation"), NULL}, @@ -181,14 +183,8 @@ struct poptOption rpmInstallPoptTable[] = { N_("skip files with leading component <path> "), N_("<path>") }, -#ifdef DYING - { "force", '\0', POPT_BIT_SET, &rpmIArgs.probFilter, - (RPMPROB_FILTER_REPLACEPKG | RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES | RPMPROB_FILTER_OLDPACKAGE), - N_("short hand for --replacepkgs --replacefiles"), NULL}, -#else { "force", '\0', 0, NULL, RPMCLI_POPT_FORCE, N_("short hand for --replacepkgs --replacefiles"), NULL}, -#endif { "freshen", 'F', POPT_BIT_SET, &rpmIArgs.installInterfaceFlags, (INSTALL_UPGRADE|INSTALL_FRESHEN|INSTALL_INSTALL), @@ -208,25 +204,20 @@ struct poptOption rpmInstallPoptTable[] = { { "includedocs", '\0', POPT_ARGFLAG_DOC_HIDDEN, &rpmIArgs.incldocs, 0, N_("install documentation"), NULL}, -#ifdef DYING - { "install", '\0', POPT_BIT_SET, - &rpmIArgs.installInterfaceFlags, INSTALL_INSTALL, - N_("install package(s)"), N_("<packagefile>+") }, -#else { "install", 'i', 0, NULL, 'i', N_("install package(s)"), N_("<packagefile>+") }, -#endif { "justdb", '\0', POPT_BIT_SET, &rpmIArgs.transFlags, RPMTRANS_FLAG_JUSTDB, N_("update the database, but do not modify the filesystem"), NULL}, -#ifdef DYING - { "nodeps", '\0', 0, &rpmIArgs.noDeps, 0, - N_("do not verify package dependencies"), NULL }, -#else + { "noconfigs", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN, + &rpmIArgs.transFlags, RPMTRANS_FLAG_NOCONFIGS, + N_("do not install configuration files"), NULL}, { "nodeps", '\0', 0, NULL, RPMCLI_POPT_NODEPS, N_("do not verify package dependencies"), NULL }, -#endif + { "nodocs", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN, + &rpmIArgs.transFlags, RPMTRANS_FLAG_NODOCS, + N_("do not install documentation"), NULL}, { "nomd5", '\0', 0, NULL, RPMCLI_POPT_NOMD5, N_("don't verify MD5 digest of files"), NULL }, @@ -239,14 +230,9 @@ struct poptOption rpmInstallPoptTable[] = { RPMTRANS_FLAG_NOSUGGEST, N_("do not suggest missing dependency resolution(s)"), NULL}, -#ifdef DYING - { "noscripts", '\0', POPT_BIT_SET, &rpmIArgs.transFlags, - (_noTransScripts|_noTransTriggers), - N_("do not execute package scriptlet(s)"), NULL }, -#else { "noscripts", '\0', 0, NULL, RPMCLI_POPT_NOSCRIPTS, N_("do not execute package scriptlet(s)"), NULL }, -#endif + { "nopre", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN, &rpmIArgs.transFlags, RPMTRANS_FLAG_NOPRE, N_("do not execute %%pre scriptlet (if any)"), NULL }, @@ -260,21 +246,12 @@ struct poptOption rpmInstallPoptTable[] = { RPMTRANS_FLAG_NOPOSTUN, N_("do not execute %%postun scriptlet (if any)"), NULL }, -#ifdef DYING - { "nodigest", '\0', POPT_BIT_SET, &rpmIArgs.qva_flags, VERIFY_DIGEST, - N_("don't verify package digest(s)"), NULL }, - { "nohdrchk", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN, &rpmIArgs.qva_flags, VERIFY_HDRCHK, - N_("don't verify database header(s) when retrieved"), NULL }, - { "nosignature", '\0', POPT_BIT_SET, &rpmIArgs.qva_flags, VERIFY_SIGNATURE, - N_("don't verify package signature(s)"), NULL }, -#else { "nodigest", '\0', POPT_ARGFLAG_DOC_HIDDEN, 0, RPMCLI_POPT_NODIGEST, N_("don't verify package digest(s)"), NULL }, { "nohdrchk", '\0', POPT_ARGFLAG_DOC_HIDDEN, 0, RPMCLI_POPT_NOHDRCHK, N_("don't verify database header(s) when retrieved"), NULL }, { "nosignature", '\0', POPT_ARGFLAG_DOC_HIDDEN, 0, RPMCLI_POPT_NOSIGNATURE, N_("don't verify package signature(s)"), NULL }, -#endif { "notriggers", '\0', POPT_BIT_SET, &rpmIArgs.transFlags, _noTransTriggers, N_("do not execute any scriptlet(s) triggered by this package"), NULL}, |