diff options
| author | jbj <devnull@localhost> | 2001-07-10 17:59:11 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2001-07-10 17:59:11 +0000 |
| commit | e15b4593ebd2f2f147a8c86511aec1b0decb34ab (patch) | |
| tree | b76b966c23f85f6812cc091656fa416d0efcc05c /lib/poptI.c | |
| parent | f440f450d9648f06ed8589adf7d4c1d6a286550b (diff) | |
| download | librpm-tizen-e15b4593ebd2f2f147a8c86511aec1b0decb34ab.tar.gz librpm-tizen-e15b4593ebd2f2f147a8c86511aec1b0decb34ab.tar.bz2 librpm-tizen-e15b4593ebd2f2f147a8c86511aec1b0decb34ab.zip | |
- package version now configureable, default v3.
- rename rpm libraries to have version with libtool -release.
- fix: -i CLI context broken Yet Again.
CVS patchset: 4930
CVS date: 2001/07/10 17:59:11
Diffstat (limited to 'lib/poptI.c')
| -rw-r--r-- | lib/poptI.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/poptI.c b/lib/poptI.c index eca9ad502..6404ced80 100644 --- a/lib/poptI.c +++ b/lib/poptI.c @@ -104,7 +104,8 @@ struct poptOption rpmInstallPoptTable[] = { { "dirstash", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN, &rpmIArgs.transFlags, RPMTRANS_FLAG_DIRSTASH, N_("save erased package files by renaming into sub-directory"), NULL}, - { "erase", 'e', 0, 0, 'e', + { "erase", 'e', POPT_BIT_SET, + &rpmIArgs.installInterfaceFlags, INSTALL_ERASE, N_("erase (uninstall) package"), N_("<package>+") }, { "excludedocs", '\0', POPT_BIT_SET, &rpmIArgs.transFlags, RPMTRANS_FLAG_NODOCS, @@ -116,7 +117,7 @@ struct poptOption rpmInstallPoptTable[] = { (RPMPROB_FILTER_REPLACEPKG | RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES | RPMPROB_FILTER_OLDPACKAGE), N_("short hand for --replacepkgs --replacefiles"), NULL}, { "freshen", 'F', POPT_BIT_SET, &rpmIArgs.installInterfaceFlags, - (INSTALL_UPGRADE|INSTALL_FRESHEN|INSTALL_NOERASE), + (INSTALL_UPGRADE|INSTALL_FRESHEN|INSTALL_INSTALL), N_("upgrade package(s) if already installed"), N_("<packagefile>+") }, { "hash", 'h', POPT_BIT_SET, &rpmIArgs.installInterfaceFlags, INSTALL_HASH, @@ -133,7 +134,7 @@ struct poptOption rpmInstallPoptTable[] = { { "includedocs", '\0', 0, &rpmIArgs.incldocs, 0, N_("install documentation"), NULL}, { "install", '\0', POPT_BIT_SET, - &rpmIArgs.installInterfaceFlags, INSTALL_NOERASE, + &rpmIArgs.installInterfaceFlags, INSTALL_INSTALL, N_("install package"), N_("<packagefile>+") }, { "justdb", '\0', POPT_BIT_SET, &rpmIArgs.transFlags, RPMTRANS_FLAG_JUSTDB, N_("update the database, but do not modify the filesystem"), NULL}, @@ -204,7 +205,7 @@ struct poptOption rpmInstallPoptTable[] = { { "test", '\0', POPT_BIT_SET, &rpmIArgs.transFlags, RPMTRANS_FLAG_TEST, N_("don't install, but tell if it would work or not"), NULL}, { "upgrade", 'U', POPT_BIT_SET, - &rpmIArgs.installInterfaceFlags, (INSTALL_UPGRADE|INSTALL_NOERASE), + &rpmIArgs.installInterfaceFlags, (INSTALL_UPGRADE|INSTALL_INSTALL), N_("upgrade package(s)"), N_("<packagefile>+") }, |