[yum-commits] Branch 'yum-3_2_X' - test/simpleobsoletestests.py yum/__init__.py

[James Antill]

 test/simpleobsoletestests.py |   10 ++++++++++
 yum/__init__.py              |   10 +---------
 2 files changed, 11 insertions(+), 9 deletions(-)

New commits:
commit 179893590e0a18b37e66401b213ae4dab26870f5
Author: James Antill <james at and.org>
Date:   Sat Nov 15 13:31:56 2008 -0500

    Remove debug lines, fix "yum update foo" where foo is obsolseted by an update

diff --git a/test/simpleobsoletestests.py b/test/simpleobsoletestests.py
index 8c37a83..2e5b5a7 100644
--- a/test/simpleobsoletestests.py
+++ b/test/simpleobsoletestests.py
@@ -273,6 +273,16 @@ class SimpleObsoletesTests(OperationsTests):
         self.assert_(res=='ok', msg)
         self.assertResult((pkgs['shark'],))
 
+    def testMultiObs5(self):
+        # This tests update of the to be obsoleted pkg...
+        pkgs = self._MultiObsHelper()
+        oldshark = FakePackage('shark', '0.1', '1', '0', 'noarch')
+
+        res, msg = self.runOperation(['update', 'nash'],
+                                     pkgs['pi'] + [oldshark], pkgs['po'])
+        self.assert_(res=='ok', msg)
+        self.assertResult((pkgs['shark'],))
+
 class GitMetapackageObsoletesTests(OperationsTests):
 
     @staticmethod
diff --git a/yum/__init__.py b/yum/__init__.py
index 1d770f9..6bbae16 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -2713,18 +2713,10 @@ class YumBase(depsolve.Depsolve):
 
         # check for obsoletes first
         if self.conf.obsoletes:
-            print "JDBG:", instpkgs, availpkgs
             for installed_pkg in instpkgs:
-                print "JDBG: inst:", installed_pkg, self.up.getObsoletesList(name=installed_pkg.name, arch=installed_pkg.arch)
                 for obsoleting in self.up.obsoleted_dict.get(installed_pkg.pkgtup, []):
-                    print "JDBG: obs:", obsoleting
                     obsoleting_pkg = self.getPackageObject(obsoleting)
-                    # FIXME check for what might be in there here
-                    txmbr = self.tsInfo.addObsoleting(obsoleting_pkg, installed_pkg)
-                    self.tsInfo.addObsoleted(installed_pkg, obsoleting_pkg)
-                    if requiringPo:
-                        txmbr.setAsDep(requiringPo)
-                    tx_return.append(txmbr)
+                    tx_return.extend(self.install(po=obsoleting_pkg))
             for available_pkg in availpkgs:
                 for obsoleted in self.up.obsoleting_dict.get(available_pkg.pkgtup, []):
                     obsoleted_pkg = self.getInstalledPackageObject(obsoleted)