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

[skvidal at osuosl.org]

 yum/yumRepo.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2631462f10876efd9b35d10250597e64693a2ebc
Merge: 21c0b95... bc23a93...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Mon Feb 23 00:06:19 2009 -0500

    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:
      Add documentation for color_update_* and color_list_*_reinstall
      Fix which line gets sorted in list updates
      And do the update highlighting for obsoletes
      Do the "yum update" colours for list updates
      Add whizbang colorization to update, to show which pkgs are on disk
      Add reinstall colour, now we display them

commit 21c0b95a00a87d3865adb5e87d415c7bc5c6c30b
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Mon Feb 23 00:05:02 2009 -0500

    if metadata is formed oddly - then we traceback b/c the url is Not None but also 'scheme' doesn't exist yet.
    This is a situation with "valid" but odd metadata where we have:
    <location base="" href="somepkg.rpm">

diff --git a/yum/yumRepo.py b/yum/yumRepo.py
index d177886..afd0877 100644
--- a/yum/yumRepo.py
+++ b/yum/yumRepo.py
@@ -708,7 +708,7 @@ class YumRepository(Repository, config.RepoConf):
             except Errors.MediaError, e:
                 verbose_logger.log(logginglevels.DEBUG_2, "Error getting package from media; falling back to url %s" %(e,))
 
-        if url is not None and scheme != "media":
+        if url and scheme != "media":
             ug = URLGrabber(keepalive = self.keepalive,
                             bandwidth = self.bandwidth,
                             retry = self.retries,