[yum-cvs] yum/yum __init__.py,1.210,1.211

[Seth Vidal]

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

Modified Files:
	__init__.py 
Log Message:

mark as 2.9.1 - forward port patch from 2.6 for installing obsoletes


Index: __init__.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/__init__.py,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- __init__.py	16 Jun 2006 13:52:44 -0000	1.210
+++ __init__.py	19 Jun 2006 03:14:41 -0000	1.211
@@ -48,7 +48,7 @@
 from constants import *
 from packageSack import ListPackageSack
 
-__version__ = '2.9.0'
+__version__ = '2.9.1'
 
 class YumBase(depsolve.Depsolve):
     """This is a primary structure and base class. It houses the objects and
@@ -1754,6 +1754,16 @@
                 self.errorlog(2, 'Package %s already installed and latest version' % po)
                 continue
 
+            
+            # make sure we're not installing a package which is obsoleted by something
+            # else in the repo
+            thispkgobsdict = self.up.checkForObsolete([po.pkgtup])
+            if thispkgobsdict.has_key(po.pkgtup):
+                obsoleting = thispkgobsdict[po.pkgtup][0]
+                obsoleting_pkg = self.getPackageObject(obsoleting)
+                self.install(po=obsoleting_pkg)
+                continue
+                
             txmbr = self.tsInfo.addInstall(po)
             tx_return.append(txmbr)