diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2010-03-19 16:52:19 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2010-03-19 16:52:19 +0200 |
| commit | d87d831cdfd3a8b389dfc71d5b671c5e7dcf74d9 (patch) | |
| tree | 8ab1abacedd8c07bf8a951e788be5da56c7e88e3 /lib/query.c | |
| parent | f510c8704cbd08719e5f868976cfd4242b6fca13 (diff) | |
| download | librpm-tizen-d87d831cdfd3a8b389dfc71d5b671c5e7dcf74d9.tar.gz librpm-tizen-d87d831cdfd3a8b389dfc71d5b671c5e7dcf74d9.tar.bz2 librpm-tizen-d87d831cdfd3a8b389dfc71d5b671c5e7dcf74d9.zip | |
Eliminate --wtfwalk .. err, --ftswalk and everything implementing it
- that's what find + xargs are for, this is just useless cruft
Diffstat (limited to 'lib/query.c')
| -rw-r--r-- | lib/query.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/query.c b/lib/query.c index 1d4d69745..7622a4364 100644 --- a/lib/query.c +++ b/lib/query.c @@ -316,7 +316,6 @@ int rpmQueryVerify(QVA_t qva, rpmts ts, const char * arg) case RPMQV_RPM: case RPMQV_ALL: case RPMQV_HDLIST: - case RPMQV_FTSWALK: res = rpmgiShowMatches(qva, ts); break; @@ -535,7 +534,7 @@ static int rpmcliArgIterHelper(rpmts ts, QVA_t qva, rpmTag tag, ARGV_const_t arg int ec = 0; qva->qva_gi = rpmgiNew(ts, tag, NULL, 0); - rpmgiSetArgs(qva->qva_gi, argv, ftsOpts, gFlgs); + rpmgiSetArgs(qva->qva_gi, argv, gFlgs); /* FIX: argv can be NULL, cast to pass argv array */ ec = rpmQueryVerify(qva, ts, (tag == RPMDBI_PACKAGES)? (const char *) argv : NULL); @@ -557,14 +556,9 @@ int rpmcliArgIter(rpmts ts, QVA_t qva, ARGV_const_t argv) case RPMQV_HDLIST: ec = rpmcliArgIterHelper(ts, qva, RPMDBI_HDLIST, argv, giFlags); break; - case RPMQV_FTSWALK: - if (ftsOpts == 0) - ftsOpts = (RPMGI_COMFOLLOW | RPMGI_LOGICAL | RPMGI_NOSTAT); - ec = rpmcliArgIterHelper(ts, qva, RPMDBI_FTSWALK, argv, giFlags); - break; default: qva->qva_gi = rpmgiNew(ts, RPMDBI_ARGLIST, NULL, 0); - rpmgiSetArgs(qva->qva_gi, argv, ftsOpts, + rpmgiSetArgs(qva->qva_gi, argv, (giFlags | (RPMGI_NOGLOB|RPMGI_NOHEADER))); while (rpmgiNext(qva->qva_gi) == RPMRC_OK) { ec += rpmQueryVerify(qva, ts, rpmgiHdrPath(qva->qva_gi)); |