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

[James Antill]

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

New commits:
commit 9b5293383ed3be88e3a828ba1311160776ffee51
Author: James Antill <james at and.org>
Date:   Thu Dec 17 10:59:00 2009 -0500

    Fix accidental revert in 0a2be676, which I was using to test

diff --git a/yum/__init__.py b/yum/__init__.py
index bf267b4..92ca2b2 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -2372,7 +2372,7 @@ class YumBase(depsolve.Depsolve):
                                         use.append(pkg)
                                 pkgs = use
                                
-                        pkgs = packagesNewestByNameArch(pkgs)
+                        pkgs = packagesNewestByName(pkgs)
 
                         if not self.tsInfo.conditionals.has_key(cond):
                             self.tsInfo.conditionals[cond] = []
@@ -2815,7 +2815,7 @@ class YumBase(depsolve.Depsolve):
                            
                             pkgs = use
                            
-                pkgs = packagesNewestByNameArch(pkgs)
+                pkgs = packagesNewestByName(pkgs)
 
                 pkgbyname = {}
                 for pkg in pkgs:
@@ -3130,7 +3130,7 @@ class YumBase(depsolve.Depsolve):
                 # This is done so we don't have to returnObsoletes(newest=True)
                 # It's a minor UI problem for RHEL, but might as well dtrt.
                 obs_pkgs = [self.getPackageObject(tup) for tup in obs_tups]
-                for obsoleting_pkg in packagesNewestByNameArch(obs_pkgs):
+                for obsoleting_pkg in packagesNewestByName(obs_pkgs):
                     tx_return.extend(self.install(po=obsoleting_pkg))
             for available_pkg in availpkgs:
                 for obsoleted in self.up.obsoleting_dict.get(available_pkg.pkgtup, []):