[yum-git] Branch 'yum-3_2_X' - 2 commits - yum/depsolve.py yum/yumRepo.py

[James Antill]

 yum/depsolve.py |    4 ++--
 yum/yumRepo.py  |    7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 6fe6847ddba441277903814dde8ece9a563e8d66
Author: James Antill <james at and.org>
Date:   Tue Jul 8 16:09:14 2008 -0400

    Another fix for the simple mirrorlist change, pass full file contents to write

diff --git a/yum/yumRepo.py b/yum/yumRepo.py
index 76c13fd..0b3e9fa 100644
--- a/yum/yumRepo.py
+++ b/yum/yumRepo.py
@@ -1243,12 +1243,13 @@ class YumRepository(Repository, config.RepoConf):
         """ read the mirror list from the specified file object """
         returnlist = []
 
+        content = []
         if fo is not None:
             try:
                 content = fo.readlines()
             except Exception, e:
                 print "Could not read mirrorlist %s error was \n%s" %(url, e)
-                content = ""
+                content = []
             for line in content:
                 if re.match('^\s*\#.*', line) or re.match('^\s*$', line):
                     continue
@@ -1256,7 +1257,7 @@ class YumRepository(Repository, config.RepoConf):
                 (mirror, count) = re.subn('\$ARCH', '$BASEARCH', mirror)
                 returnlist.append(mirror)
 
-        return returnlist
+        return (returnlist, content)
 
     def _getMirrorList(self):
         """retrieve an up2date-style mirrorlist file from our mirrorlist url,
@@ -1284,7 +1285,7 @@ class YumRepository(Repository, config.RepoConf):
                 print "Could not retrieve mirrorlist %s error was\n%s" % (url, e)
                 fo = None
 
-        returnlist = self._readMirrorList(fo)
+        (returnlist, content) = self._readMirrorList(fo)
 
         if returnlist:
             if not self.cache and not cacheok:
commit 668fbcc4668cf857e0cecca30b84f8a7d0aaf670
Author: James Antill <james at and.org>
Date:   Tue Jul 8 14:55:02 2008 -0400

    Use getBestArch instead of getCanonArch, when comnparing providers, helps ppc64

diff --git a/yum/depsolve.py b/yum/depsolve.py
index 9d85284..8bb2cf1 100644
--- a/yum/depsolve.py
+++ b/yum/depsolve.py
@@ -25,7 +25,7 @@ import logging
 import rpmUtils.transaction
 import rpmUtils.miscutils
 import rpmUtils.arch
-from rpmUtils.arch import archDifference, isMultiLibArch, getCanonArch
+from rpmUtils.arch import archDifference, isMultiLibArch, getBestArch
 import misc
 from misc import unique, version_tuple_to_string
 import rpm
@@ -987,7 +987,7 @@ class Depsolve(object):
                         pkgresults[po] -= 1024
                         break
 
-                for thisarch in (reqpo.arch, getCanonArch()):
+                for thisarch in (reqpo.arch, getBestArch()):
                     res = _compare_arch_distance(po, nextpo, thisarch)
                     if not res:
                         continue