[yum-cvs] yum/yum packageSack.py,1.5,1.6 rpmsack.py,1.17,1.18

[Seth Vidal]

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

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

all sacks should now have:
searchNevra
searchPO
searchPkgTuples

it should return a list of package objects in every case


Index: packageSack.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/packageSack.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- packageSack.py	21 Aug 2006 20:16:06 -0000	1.5
+++ packageSack.py	22 Aug 2006 02:54:07 -0000	1.6
@@ -17,6 +17,8 @@
 from Errors import PackageSackError
 from rpmUtils import miscutils
 from packages import YumInstalledPackage
+import warnings
+
 
 class PackageSackBase:
     """Base class that provides the interface for PackageSacks."""
@@ -46,7 +48,16 @@
     def searchNevra(self, name=None, epoch=None, ver=None, rel=None, arch=None):
         """return list of pkgobjects matching the nevra requested"""
         raise NotImplementedError()
-           
+    
+    def searchPO(self, po):
+        """return list of package objects matching the name, epoch, ver, rel,
+           arch of the package object passed in"""
+        raise NotImplementedError()
+    
+    def searchPkgTuple(self, pkgtup):
+        """return list of pkgobject matching the (n,a,e,v,r) tuple"""
+        raise NotImplementedError()
+        
     def searchRequires(self, name):
         """return list of package requiring the name (any evr and flag)"""
         raise NotImplementedError()
@@ -295,8 +306,10 @@
 
     def packagesByTuple(self, pkgtup):
         """return a list of package objects by (n,a,e,v,r) tuple"""
-        (n,a,e,v,r) = pkgtup
-        return self.searchNevra(name=n, arch=a, epoch=e, ver=v, rel=r)
+        warnings.warn('packagesByTuple() will go away in a future version of Yum.\n',
+                DeprecationWarning, stacklevel=2)
+        
+        return self.searchPkgTuple(pkgtup)
         
     def searchNevra(self, name=None, epoch=None, ver=None, rel=None, arch=None):
         """return list of pkgobjects matching the nevra requested"""
@@ -305,7 +318,19 @@
             return self.nevra[(name, epoch, ver, rel, arch)]
         else:
             return []
+
+    def searchPO(self, po):
+        """return list of package objects matching the name, epoch, ver, rel,
+           arch of the package object passed in"""
            
+        return self.searchNevra(name=po.name, epoch=po.epoch, ver=po.ver, 
+                                rel=po.rel, arch=po.arch)
+    
+    def searchPkgTuple(self, pkgtup):
+        """return list of pkgobject matching the (n,a,e,v,r) tuple"""
+        (n,a,e,v,r) = pkgtup
+        return self.searchNevra(name=n, arch=a, epoch=e, ver=v, rel=r)
+        
     def searchRequires(self, name):
         """return list of package requiring the name (any evr and flag)"""
         self._checkIndexes(failure='build')        

Index: rpmsack.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/rpmsack.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rpmsack.py	22 Aug 2006 00:09:12 -0000	1.17
+++ rpmsack.py	22 Aug 2006 02:54:07 -0000	1.18
@@ -254,6 +254,20 @@
 
     def packagesByTuple(self, pkgtup):
         """return a list of package objects by (n,a,e,v,r) tuple"""
+        warnings.warn('packagesByTuple() will go away in a future version of Yum.\n',
+                DeprecationWarning, stacklevel=2)
+        
+        return self.searchPkgTuple(pkgtup)
+        
+    def searchPO(self, po):
+        """return list of package objects matching the name, epoch, ver, rel,
+           arch of the package object passed in"""
+           
+        return self.searchNevra(name=po.name, epoch=po.epoch, ver=po.ver, 
+                                rel=po.rel, arch=po.arch)
+    
+    def searchPkgTuple(self, pkgtup):
+        """return list of pkgobject matching the (n,a,e,v,r) tuple"""
         (n,a,e,v,r) = pkgtup
         return self.searchNevra(name=n, arch=a, epoch=e, ver=v, rel=r)