[yum-cvs] yum/yum rpmsack.py,1.19,1.20

[Jeremy Katz]

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

Modified Files:
	rpmsack.py 
Log Message:
don't do this check at runtime.  it fails if you have an empty rpmdb.  and
since we have no fallback, it doesn't help us much.  we just need to 
Requires: a new enough version of rpm-python to support this


Index: rpmsack.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/rpmsack.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- rpmsack.py	22 Aug 2006 17:44:42 -0000	1.19
+++ rpmsack.py	24 Aug 2006 20:08:16 -0000	1.20
@@ -53,17 +53,6 @@
     def buildIndexes(self):
         self.header_indexes = {}
         
-        try:
-            # we need the find a known index so we can test if
-            # rpm/rpm-python allows us to grab packages by db index.
-            mi = self.ts.dbMatch()
-            hdr = mi.next()
-            known_index = mi.instance()
-            mi = self.ts.dbMatch(0, known_index)
-            hdr = mi.next()
-        except (TypeError, StopIteration), e:
-            raise PackageSackError, "Match Iterators not supported in rpm. Please upgrade rpm-python"
-            
         mi = self.ts.dbMatch()
         for hdr in mi:
             pkgtuple = self._hdr2pkgTuple(hdr)
@@ -157,7 +146,7 @@
 
     def simplePkgList(self, repoid=None):
         return self.pkglist
-    
+   
     def installed(self, name=None, arch=None, epoch=None, ver=None, rel=None, po=None):
         if po:
             name = po.name
@@ -425,7 +414,7 @@
     sack = RPMDBPackageSack(ts)
     sack.buildIndexes()
 
-    for p in sack.returnPackages():
+    for p in sack.simplePkgList():
         print p
 
 if __name__ == '__main__':