diff options
| author | jbj <devnull@localhost> | 2003-01-25 20:59:52 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2003-01-25 20:59:52 +0000 |
| commit | c87fa0b0298dda7ae49e3b079a7d464934188fe2 (patch) | |
| tree | 249b92cb8db4add70f0b8f0f2b8dc499862aebce /tools | |
| parent | 8441baccd286b9693e74841946d338c3667f0bae (diff) | |
| download | rpm-c87fa0b0298dda7ae49e3b079a7d464934188fe2.tar.gz rpm-c87fa0b0298dda7ae49e3b079a7d464934188fe2.tar.bz2 rpm-c87fa0b0298dda7ae49e3b079a7d464934188fe2.zip | |
- permit anaconda to choose "presentation order".
CVS patchset: 6028
CVS date: 2003/01/25 20:59:52
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/rpmgraph.c | 12 | ||||
| -rw-r--r-- | tools/rpmsort.c | 4 |
2 files changed, 3 insertions, 13 deletions
diff --git a/tools/rpmgraph.c b/tools/rpmgraph.c index d9ca2f40b..302c82a03 100644 --- a/tools/rpmgraph.c +++ b/tools/rpmgraph.c @@ -15,7 +15,6 @@ #include "debug.h" static int noDeps = 1; -static int noChainsaw = 0; static rpmVSFlags vsflags = 0; @@ -57,7 +56,6 @@ rpmGraph(rpmts ts, struct rpmInstallArguments_s * ia, const char ** fileArgv) int argc = 0; const char ** av = NULL; int ac = 0; - int tsflags; Header h; rpmRC rpmrc; int rc = 0; @@ -67,11 +65,6 @@ rpmGraph(rpmts ts, struct rpmInstallArguments_s * ia, const char ** fileArgv) if (fileArgv == NULL) return 0; - tsflags = rpmtsFlags(ts); - if (!noChainsaw) - tsflags |= RPMTRANS_FLAG_CHAINSAW; - (void) rpmtsSetFlags(ts, tsflags); - if (ia->qva_flags & VERIFY_DIGEST) vsflags |= _RPMVSF_NODIGESTS; if (ia->qva_flags & VERIFY_SIGNATURE) @@ -275,8 +268,9 @@ static struct poptOption optionsTable[] = { { "nolegacy", '\0', POPT_BIT_SET, &vsflags, RPMVSF_NEEDPAYLOAD, N_("don't verify header+payload signature"), NULL }, - { "nochainsaw", '\0', POPT_ARGFLAG_DOC_HIDDEN, &noChainsaw, 0, - NULL, NULL}, + { "anaconda", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN, + &rpmIArgs.transFlags, RPMTRANS_FLAG_ANACONDA, + N_("use anaconda \"presentation order\""), NULL}, { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmcliAllPoptTable, 0, N_("Common options for all rpm modes and executables:"), diff --git a/tools/rpmsort.c b/tools/rpmsort.c index 0a0a7067c..f13d24f60 100644 --- a/tools/rpmsort.c +++ b/tools/rpmsort.c @@ -18,7 +18,6 @@ static int _depends_debug; static int noAvailable = 1; static const char * avdbpath = "/usr/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/redhat"; -static int noChainsaw = 0; static int noDeps = 0; static inline /*@observer@*/ const char * const identifyDepend(int_32 f) @@ -66,8 +65,6 @@ do_tsort(const char *fileArgv[]) return 0; ts = rpmtsCreate(); - if (!noChainsaw) - (void) rpmtsSetFlags(ts, rpmtsFlags(ts) | RPMTRANS_FLAG_CHAINSAW); rc = rpmtsOpenDB(ts, O_RDONLY); if (rc) { @@ -277,7 +274,6 @@ exit: static struct poptOption optionsTable[] = { { "noavailable", '\0', 0, &noAvailable, 0, NULL, NULL}, - { "nochainsaw", '\0', 0, &noChainsaw, 0, NULL, NULL}, { "nodeps", '\0', 0, &noDeps, 0, NULL, NULL}, { "verbose", 'v', 0, 0, 'v', NULL, NULL}, { NULL, 0, 0, 0, 0, NULL, NULL} |