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

[Seth Vidal]

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

Modified Files:
	rpmsack.py 
Log Message:

emit deprecation warnings for annoying functions in rpmsack/rpmdbholder


Index: rpmsack.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/rpmsack.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rpmsack.py	19 Aug 2006 19:22:37 -0000	1.7
+++ rpmsack.py	19 Aug 2006 20:10:43 -0000	1.8
@@ -20,6 +20,7 @@
 
 import rpm
 import types
+import warnings
 
 from Errors import PackageSackError
 from rpmUtils import miscutils
@@ -155,6 +156,10 @@
     def simplePkgList(self, repoid=None):
         return self.pkglist
     
+    def installed(self, name=None, arch=None, epoch=None, ver=None, rel=None):
+        if len(self.searchNevra(name=name, arch=arch, epoch=epoch, ver=ver, rel=rel)) > 0:
+            return 1
+        return 0
         
     def returnNewestByNameArch(self, naTup=None):
 
@@ -249,7 +254,6 @@
         #        self.delPackageById(hdr[rpm.RPMTAG_SHA1HEADER])
 
 
-
     # Helper functions
 
     def mi2list(self, mi):
@@ -288,11 +292,16 @@
 
     # deprecated options for compat only - remove once rpmdb is converted:
     def getPkgList(self):
-        #FIXME - emit deprecation notice
+        warnings.warn('getPkgList() will go away in a future version of Yum.\n'
+                'Please access this via the pkglist attribute.',
+                DeprecationWarning)
+    
         return self.pkglist
 
     def getHdrList(self):
-        #FIXME - emit deprecation notice
+        warnings.warn('getHdrList() will go away in a future version of Yum.\n',
+                DeprecationWarning)
+    
         hdrlist = []
         for pkg in self.header_indexes.keys():
             for idx in self.header_indexes[pkg]:
@@ -301,6 +310,7 @@
         return hdrlist
 
     def getNameArchPkgList(self):
+    
         #FIXME - emit deprecation notice    
         lst = []
         for (name, arch, epoch, ver, rel) in self.pkglists:
@@ -317,14 +327,11 @@
             
         return miscutils.unique(lst)
 
-    def installed(self, name=None, arch=None, epoch=None, ver=None, rel=None):
-        #FIXME - emit deprecation notice    
-        if len(self.searchNevra(name=name, arch=arch, epoch=epoch, ver=ver, rel=rel)) > 0:
-            return 1
-        return 0
     
     def returnTupleByKeyword(self, name=None, arch=None, epoch=None, ver=None, rel=None):
-        #FIXME - emit deprecation notice        
+        warnings.warn('returnTuplebyKeyword() will go away in a future version of Yum.\n',
+                DeprecationWarning)
+    
         lst = self.searchNevra(name=name, arch=arch, epoch=epoch, ver=ver, rel=rel)
         returnlist = []
         for po in lst:
@@ -333,7 +340,8 @@
         return returnlist
 
     def returnHeaderByTuple(self, pkgtuple):
-        #FIXME - emit deprecation notice        
+        warnings.warn('returnHeaderByTuple() will go away in a future version of Yum.\n',
+                DeprecationWarning)
         """returns a list of header(s) based on the pkgtuple provided"""
         
         (n, a, e, v, r) = pkgtuple
@@ -347,7 +355,8 @@
             return []
 
     def returnIndexByTuple(self, pkgtuple):
-        #FIXME - emit deprecation notice        
+        warnings.warn('returnIndexbyTuple() will go away in a future version of Yum.\n',
+                DeprecationWarning)
         """returns a list of header indexes based on the pkgtuple provided"""
         
         if self.header_indexes.has_key(pkgtuple):