[yum-commits] Branch 'yum-3_2_X' - 2 commits - rpmUtils/arch.py

[skvidal at osuosl.org]

 rpmUtils/arch.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0d57b522e58d8ef0be254551ed4297ef8f0e38a1
Merge: 7c054c3... 1ae51a5...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Wed Jul 7 14:46:08 2010 -0400

    Merge branch 'yum-3_2_X' of ssh://yum.baseurl.org/srv/projects/yum/git/yum into yum-3_2_X
    
    * 'yum-3_2_X' of ssh://yum.baseurl.org/srv/projects/yum/git/yum:
      Pass the packages that failed to reinstall, fixes provides/files. BZ 612201.

commit 7c054c3eec7a1c7129640fed95ceebb78e1deee9
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Wed Jul 7 14:23:29 2010 -0400

    whoops - make sure I don't change the var name w/o correcting it elsewhere :(

diff --git a/rpmUtils/arch.py b/rpmUtils/arch.py
index 6a1404d..af0d782 100644
--- a/rpmUtils/arch.py
+++ b/rpmUtils/arch.py
@@ -406,7 +406,7 @@ class ArchStorage(object):
         self.basearch = getBaseArch(myarch=self.canonarch)
         self.archlist = getArchList(thisarch=self.canonarch)
         
-        if not archlist_includes_compat: # - do we bother including i686 and below on x86_64
+        if not archlist_includes_compat_arch: # - do we bother including i686 and below on x86_64
             limit_archlist = []
             for a in self.archlist:
                 if isMultiLibArch(a) or a == 'noarch':