RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Robert Scheck
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 07-Apr-2008 00:35:36
Branch: rpm-4_5 Handle: 2008040622353600
Modified files: (Branch: rpm-4_5)
rpm/lib librpm.vers
rpm/python rpmts-py.c
Log:
Fix rpmtsImportPubkey vs. rpmcliImportPubkey at python part correctly
Summary:
Revision Changes Path
1.2.2.4 +0 -1 rpm/lib/librpm.vers
1.65.2.4 +1 -1 rpm/python/rpmts-py.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/lib/librpm.vers
============================================================================
$ cvs diff -u -r1.2.2.3 -r1.2.2.4 librpm.vers
--- rpm/lib/librpm.vers 12 Dec 2007 02:03:33 -0000 1.2.2.3
+++ rpm/lib/librpm.vers 6 Apr 2008 22:35:36 -0000 1.2.2.4
@@ -363,7 +363,6 @@
rpmtsGetRdb;
rpmtsGetTid;
rpmtsGetType;
- rpmtsImportPubkey;
rpmtsiNext;
rpmtsInitDB;
rpmtsInitDSI;
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/rpmts-py.c
============================================================================
$ cvs diff -u -r1.65.2.3 -r1.65.2.4 rpmts-py.c
--- rpm/python/rpmts-py.c 12 Dec 2007 02:00:09 -0000 1.65.2.3
+++ rpm/python/rpmts-py.c 6 Apr 2008 22:35:36 -0000 1.65.2.4
@@ -1136,7 +1136,7 @@
pkt = (unsigned char *) PyString_AsString(blob);
pktlen = PyString_Size(blob);
- rc = rpmtsImportPubkey(s->ts, pkt, pktlen);
+ rc = rpmcliImportPubkey(s->ts, pkt, pktlen);
return Py_BuildValue("i", rc);
}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
