[yum-cvs] 3 commits -

[Seth Vidal]

 0 files changed

New commits:
commit ae2028e33540b4d786c89648078cbc332266259f
Merge: ad74ff4... d8c1407...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Wed Jan 9 10:21:36 2008 -0500

    Merge branch 'master' of ssh://login.linux.duke.edu/home/groups/yum/git/yum
    
    * 'master' of ssh://login.linux.duke.edu/home/groups/yum/git/yum:
      fixed another unneeded call to pkgtup

commit ad74ff4163db9f34267bd1c5d872d018017f81f7
Merge: d7c0d3b... 4aaff34...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Wed Jan 9 10:20:59 2008 -0500

    Merge branch 'master' of ssh://login.linux.duke.edu/home/groups/yum/git/yum
    
    * 'master' of ssh://login.linux.duke.edu/home/groups/yum/git/yum:
      Fix typo, for pkgtup change

commit d7c0d3b89dc72cc6cbe0e2bab16fabe384faaf6d
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Wed Jan 9 10:20:32 2008 -0500

    yes, well, it helps if the code you check in has any chance of working

diff --git a/yum/depsolve.py b/yum/depsolve.py
index 529d3b9..ebe4f67 100644
--- a/yum/depsolve.py
+++ b/yum/depsolve.py
@@ -626,7 +626,7 @@ class Depsolve(object):
                         pkgs = self.pkgSack.returnNewestByName(confpkg.name)
                         archs = {}
                         for pkg in pkgs:
-                            archs[a] = pkg.arch
+                            archs[pkg.arch] = pkg
                         a = rpmUtils.arch.getBestArchFromList(archs.keys())
                         po = archs[a]                        
                     except Errors.PackageSackError: