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

[skvidal at osuosl.org]

 yum/__init__.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 4bcff25dcb098ae7ccff6cfb639cca8f17656ce7
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Wed Aug 5 15:13:38 2009 -0400

    - fix update j\* with an obsoleter - changes the install() to an update() which makes it so we're not arbitrarily
    installing pkgs that happen to obsolete something
    - remove leftover JDBG at james' request

diff --git a/yum/__init__.py b/yum/__init__.py
index 9deed31..9930c08 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -1136,7 +1136,6 @@ class YumBase(depsolve.Depsolve):
         for cost in sorted(costs):
             if done: # Skip the first one, as they have lowest cost so are good.
                 for repo in costs[cost]:
-                    print "JDBG:", repo, cost, len(orepos)
                     yce = _YumCostExclude(repo, self.repos)
                     repo.sack.addPackageExcluder(repo.id, exid,
                                                  'exclude.pkgtup.in', yce)
@@ -3026,7 +3025,7 @@ class YumBase(depsolve.Depsolve):
             obsoleting_pkg = self._test_loop(available_pkg, self._pkg2obspkg)
             if obsoleting_pkg is not None:
                 self.verbose_logger.log(logginglevels.DEBUG_2, _('Not Updating Package that is obsoleted: %s'), available_pkg)
-                tx_return.extend(self.install(po=obsoleting_pkg))
+                tx_return.extend(self.update(po=obsoleting_pkg))
                 continue
             for updated in self.up.updating_dict.get(available_pkg.pkgtup, []):
                 if self.tsInfo.isObsoleted(updated):