diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2008-04-10 16:04:12 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2008-04-10 16:04:12 +0300 |
| commit | d39cc1dfda9a18a3f3254e8d9ce240ace48c6856 (patch) | |
| tree | b9bfd062e2cd41793cd9d9888a962a163a01984f | |
| parent | c01ef8228d373f9232b47ac0915bb5786e5266cf (diff) | |
| download | rpm-d39cc1dfda9a18a3f3254e8d9ce240ace48c6856.tar.gz rpm-d39cc1dfda9a18a3f3254e8d9ce240ace48c6856.tar.bz2 rpm-d39cc1dfda9a18a3f3254e8d9ce240ace48c6856.zip | |
Just call legacyRetrofit() instead of combined compress + provide retrofits
| -rw-r--r-- | python/header-py.c | 8 | ||||
| -rw-r--r-- | tools/convertdb1.c | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/python/header-py.c b/python/header-py.c index f13b51fed..605afec96 100644 --- a/python/header-py.c +++ b/python/header-py.c @@ -9,7 +9,7 @@ #include <rpm/rpmstring.h> #include <rpm/rpmts.h> /* XXX rpmtsCreate/rpmtsFree */ -#include "lib/legacy.h" /* XXX expand/compressFilelist(), providePackageNVR() */ +#include "lib/legacy.h" /* XXX expand/compressFilelist(), legacyRetrofit() */ #include "header-py.h" #include "rpmds-py.h" @@ -675,8 +675,7 @@ PyObject * hdrLoad(PyObject * self, PyObject * args, PyObject * kwds) } return NULL; } - compressFilelist (h); - providePackageNVR (h); + legacyRetrofit(h); hdr = hdr_Wrap(h); h = headerFree(h); /* XXX ref held by hdr */ @@ -703,8 +702,7 @@ PyObject * rpmReadHeaders (FD_t fd) Py_END_ALLOW_THREADS while (h) { - compressFilelist(h); - providePackageNVR(h); + legacyRetrofit(h); hdr = hdr_Wrap(h); if (PyList_Append(list, (PyObject *) hdr)) { Py_DECREF(list); diff --git a/tools/convertdb1.c b/tools/convertdb1.c index 80b919028..cb11f8ae4 100644 --- a/tools/convertdb1.c +++ b/tools/convertdb1.c @@ -163,8 +163,7 @@ main(int argc, char *argv[]) h = headerRead(fd, HEADER_MAGIC_NO); if (!h) continue; - compressFilelist(h); - providePackageNVR(h); + legacyRetrofit(h); headerNVR(h, &name, &version, &release); mi = rpmdbInitIterator(db, RPMTAG_NAME, name, 0); rpmdbSetIteratorRE(mi, RPMTAG_VERSION, RPMMIRE_DEFAULT, version); |