diff options
| author | jbj <devnull@localhost> | 2002-08-23 21:01:59 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2002-08-23 21:01:59 +0000 |
| commit | f5a546f5801067dd922aa83e7d78e8e59c84e738 (patch) | |
| tree | 3677837b7db8079de19de4e0d5e051eaf8261851 /lib/query.c | |
| parent | 4e245109ad54513ec5563b4292cce64f90482ed6 (diff) | |
| download | librpm-tizen-f5a546f5801067dd922aa83e7d78e8e59c84e738.tar.gz librpm-tizen-f5a546f5801067dd922aa83e7d78e8e59c84e738.tar.bz2 librpm-tizen-f5a546f5801067dd922aa83e7d78e8e59c84e738.zip | |
- merge signature returns into rpmRC.
- python: exceptions on NOKEY/NOTTRUSTED.
CVS patchset: 5667
CVS date: 2002/08/23 21:01:59
Diffstat (limited to 'lib/query.c')
| -rw-r--r-- | lib/query.c | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/lib/query.c b/lib/query.c index c2aaf35e0..d87077308 100644 --- a/lib/query.c +++ b/lib/query.c @@ -573,25 +573,32 @@ restart: (void) Fclose(fd); - if (!(rpmrc == RPMRC_OK || rpmrc == RPMRC_NOTFOUND)) { + res = 0; + switch (rpmrc) { + default: rpmError(RPMERR_QUERY, _("query of %s failed\n"), fileURL); res = 1; - /*@loopbreak@*/ break; - } - if (rpmrc == RPMRC_OK && h == NULL) { - rpmError(RPMERR_QUERY, + /*@switchbreak@*/ break; + case RPMRC_OK: + if (h == NULL) { + rpmError(RPMERR_QUERY, _("old format source packages cannot be queried\n")); - res = 1; - /*@loopbreak@*/ break; - } + res = 1; + /*@switchbreak@*/ break; + } - /* Query a package file. */ - if (rpmrc == RPMRC_OK) { + /* Query a package file. */ res = qva->qva_showPackage(qva, ts, h); h = headerFree(h); rpmtsEmpty(ts); continue; + /*@notreached@*/ /*@switchbreak@*/ break; + case RPMRC_NOTFOUND: + res = 0; + /*@switchbreak@*/ break; } + if (res) + /*@loopbreak@*/ break; /* Try to read a package manifest. */ fd = Fopen(fileURL, "r.fpio"); |