From d39cc1dfda9a18a3f3254e8d9ce240ace48c6856 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Thu, 10 Apr 2008 16:04:12 +0300
Subject: Just call legacyRetrofit() instead of combined compress + provide
 retrofits

---
 python/header-py.c | 8 +++-----
 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);
-- 
cgit v1.2.3