[yum-cvs] yum/yum packageSack.py,1.7,1.8 rpmsack.py,1.18,1.19

[Seth Vidal]

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

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

move the searchPO, searchPkgTuples up into PackageSackBase


Index: packageSack.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/packageSack.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- packageSack.py	22 Aug 2006 04:04:50 -0000	1.7
+++ packageSack.py	22 Aug 2006 17:44:42 -0000	1.8
@@ -40,23 +40,30 @@
 
     def populate(self, repo, with, callback, cacheOnly):
         raise NotImplementedError()
-        
+
     def packagesByTuple(self, pkgtup):
         """return a list of package objects by (n,a,e,v,r) tuple"""
-        raise NotImplementedError()
+        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"""
         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()
+           
+        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"""
-        raise NotImplementedError()
+        (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)"""
@@ -305,12 +312,6 @@
     def setCompatArchs(self, compatarchs):
         self.compatarchs = compatarchs
 
-    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 searchNevra(self, name=None, epoch=None, ver=None, rel=None, arch=None):
         """return list of pkgobjects matching the nevra requested"""
@@ -319,18 +320,6 @@
             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)"""

Index: rpmsack.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/rpmsack.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- rpmsack.py	22 Aug 2006 02:54:07 -0000	1.18
+++ rpmsack.py	22 Aug 2006 17:44:42 -0000	1.19
@@ -252,25 +252,6 @@
         
         return self.indexes2list(indexes)
 
-    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)
-
     def excludeArchs(self, archlist):
         pass
         #for arch in archlist: