[yum-cvs] yum/yum __init__.py,1.227,1.228 rpmsack.py,1.9,1.10

Seth Vidal skvidal at linux.duke.edu
Sat Aug 19 20:19:14 UTC 2006


Update of /home/groups/yum/cvs/yum/yum
In directory login1.linux.duke.edu:/tmp/cvs-serv8770/yum

Modified Files:
	__init__.py rpmsack.py 
Log Message:

purge out getHdrList()


Index: __init__.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/__init__.py,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -r1.227 -r1.228
--- __init__.py	19 Aug 2006 20:14:32 -0000	1.227
+++ __init__.py	19 Aug 2006 20:19:12 -0000	1.228
@@ -971,8 +971,7 @@
             self.doRepoSetup()
             self.doRpmDBSetup()
             inst = self.rpmdb.getPkgList()
-            for hdr in self.rpmdb.getHdrList():
-                po = YumInstalledPackage(hdr)
+            for po in self.rpmdb:
                 installed.append(po)
 
             if self.conf.showdupesfromrepos:
@@ -1007,8 +1006,7 @@
         # installed only
         elif pkgnarrow == 'installed':
             self.doRpmDBSetup()
-            for hdr in self.rpmdb.getHdrList():
-                po = YumInstalledPackage(hdr)
+            for po in self.rpmdb:
                 installed.append(po)
         
         # available in a repository
@@ -1033,8 +1031,7 @@
             self.doRepoSetup()
             self.doRpmDBSetup()
             avail = self.pkgSack.simplePkgList()
-            for hdr in self.rpmdb.getHdrList():
-                po = YumInstalledPackage(hdr)
+            for po in self.rpmdb:
                 if po.pkgtup not in avail:
                     extras.append(po)
 
@@ -1166,8 +1163,7 @@
         # do the same for installed pkgs
         
         self.doRpmDBSetup()        
-        for hdr in self.rpmdb.getHdrList(): # this is more expensive so this is the  top op
-            po = YumInstalledPackage(hdr)
+        for po in self.rpmdb: # this is more expensive so this is the  top op
             tmpvalues = []
             for string in criteria:
                 restring = self._refineSearchPattern(string)
@@ -1301,8 +1297,7 @@
             
             arg_re.append(reg)
 
-        for hdr in self.rpmdb.getHdrList():
-            po = YumInstalledPackage(hdr)
+        for po in self.rpmdb:
             tmpvalues = []
             searchlist = []
             for tag in taglist:

Index: rpmsack.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/rpmsack.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rpmsack.py	19 Aug 2006 20:14:32 -0000	1.9
+++ rpmsack.py	19 Aug 2006 20:19:12 -0000	1.10
@@ -186,7 +186,6 @@
                 allpkg.append(self._hdr2pkgTuple(hdr))
         
         del mi
-        
         if not allpkg:
             # FIXME: raise  ...
             print 'No Package Matching %s' % name




More information about the Yum-cvs-commits mailing list