folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- python: don't remap NOKEY/UNTRUSTED to OK. 

CVS patchset: 5671
CVS date: 2002/08/26 17:42:39
This commit is contained in:
jbj 2002-08-26 17:42:39 +00:00
parent f267c44df6
commit 4914b09624
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/package.c
View File

@ -818,16 +818,13 @@ int rpmReadPackageFile(rpmts ts, FD_t fd,
/* XXX Print NOKEY/NOTTRUSTED warning only once. */
{ int lvl = (rpmtsStashKeyid(ts) ? RPMMESS_DEBUG : RPMMESS_WARNING);
rpmMessage(lvl, "%s: %s", fn, buf);
rc = RPMRC_OK;
} break;
case RPMRC_NOTFOUND: /* Signature is unknown type. */
rpmMessage(RPMMESS_WARNING, "%s: %s", fn, buf);
rc = RPMRC_OK;
break;
default:
case RPMRC_FAIL: /* Signature does not verify. */
rpmMessage(RPMMESS_ERROR, "%s: %s", fn, buf);
rc = RPMRC_FAIL;
break;
}

6
python/rpmts-py.c
View File

@ -727,15 +727,15 @@ rpmts_HdrFromFdno(rpmtsObject * s, PyObject * args)
int fdno;
rpmRC rpmrc;
if (_rpmts_debug)
fprintf(stderr, "*** rpmts_HdrFromFdno(%p) ts %p\n", s, s->ts);
if (!PyArg_ParseTuple(args, "i:HdrFromFdno", &fdno)) return NULL;
fd = fdDup(fdno);
rpmrc = rpmReadPackageFile(s->ts, fd, "rpmts_HdrFromFdno", &h);
Fclose(fd);
if (_rpmts_debug)
fprintf(stderr, "*** rpmts_HdrFromFdno(%p) ts %p rc %d\n", s, s->ts, rpmrc);
switch (rpmrc) {
case RPMRC_OK:
if (h)