[yum-cvs] yum/yum __init__.py, 1.228, 1.229 depsolve.py, 1.85, 1.86 rpmsack.py, 1.11, 1.12

[Seth Vidal]

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

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

checking in lots of minor changes to get rid of deprecation warnings
add 'po' keyword to rpmsack.searchNevra so a package object can be passed in
instead of just nevras. Maybe should be a new method to just take the
package object or a more generic search method.


Index: __init__.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/__init__.py,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- __init__.py	19 Aug 2006 20:19:12 -0000	1.228
+++ __init__.py	20 Aug 2006 13:52:03 -0000	1.229
@@ -115,7 +115,7 @@
             startupconf.debuglevel = debuglevel
         if errorlevel != None:
             startupconf.errorlevel = errorlevel
-    
+        
         self.doLoggingSetup(startupconf.debuglevel, startupconf.errorlevel)
 
         if init_plugins and startupconf.plugins:
@@ -341,7 +341,7 @@
             self.doRepoSetup()
             self.doSackSetup()
         
-        self.up = rpmUtils.updates.Updates(self.rpmdb.getPkgList(),
+        self.up = rpmUtils.updates.Updates(self.rpmdb.simplePkgList(),
                                            self.pkgSack.simplePkgList())
         if self.conf.debuglevel >= 6:
             self.up.debug = 1
@@ -403,7 +403,7 @@
             raise Errors.GroupsError, 'No Groups Available in any repository'
         
         self.doRpmDBSetup()
-        pkglist = self.rpmdb.getPkgList()
+        pkglist = self.rpmdb.simplePkgList()
         self.comps.compile(pkglist)
             
     def doSackFilelistPopulate(self):
@@ -970,7 +970,7 @@
         if pkgnarrow == 'all': 
             self.doRepoSetup()
             self.doRpmDBSetup()
-            inst = self.rpmdb.getPkgList()
+            inst = self.rpmdb.simplePkgList()
             for po in self.rpmdb:
                 installed.append(po)
 
@@ -1013,7 +1013,7 @@
         elif pkgnarrow == 'available':
             self.doRepoSetup()
             self.doRpmDBSetup()
-            inst = self.rpmdb.getPkgList()
+            inst = self.rpmdb.simplePkgList()
             if self.conf.showdupesfromrepos:
                 avail = self.pkgSack.returnPackages()
             else:

Index: depsolve.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/depsolve.py,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- depsolve.py	12 Jul 2006 17:53:56 -0000	1.85
+++ depsolve.py	20 Aug 2006 13:52:03 -0000	1.86
@@ -563,7 +563,7 @@
         # get rid of things that are already in the rpmdb - b/c it's pointless to use them here
 
         for pkg in provSack.returnPackages():
-            if pkg.pkgtup in self.rpmdb.getPkgList(): # is it already installed?
+            if pkg.pkgtup in self.rpmdb.simplePkgList(): # is it already installed?
                 self.verbose_logger.log(logginglevels.DEBUG_2, '%s is in providing packages but it is already installed, removing.', pkg)
                 provSack.delPackage(pkg)
                 continue
@@ -635,7 +635,7 @@
         elif len(newest) == 1:
             best = newest[0]
         
-        if best.pkgtup in self.rpmdb.getPkgList(): # is it already installed?
+        if self.rpmdb.installed(po=best): # is it already installed?
             missingdep = 1
             checkdeps = 0
             msg = 'Missing Dependency: %s is needed by package %s' % (needname, name)

Index: rpmsack.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/rpmsack.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rpmsack.py	19 Aug 2006 20:20:41 -0000	1.11
+++ rpmsack.py	20 Aug 2006 13:52:03 -0000	1.12
@@ -172,11 +172,19 @@
     def simplePkgList(self, repoid=None):
         return self.pkglist
     
-    def installed(self, name=None, arch=None, epoch=None, ver=None, rel=None):
+    def installed(self, name=None, arch=None, epoch=None, ver=None, rel=None, po=None):
+        if po:
+            name = po.name
+            arch = po.arch
+            epoch = po.epoch
+            ver = po.ver
+            rel = po.rel
+            
         if len(self.searchNevra(name=name, arch=arch, epoch=epoch, ver=ver, rel=rel)) > 0:
             return 1
         return 0
-        
+    
+
     def returnNewestByNameArch(self, naTup=None):
 
         if not naTup: