[Yum-devel] [PATCH 3/3] cleanup: Use URLGrabError consistently

Zdeněk Pavlas zpavlas at redhat.com
Thu Sep 6 14:53:09 UTC 2012


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

diff --git a/yum/yumRepo.py b/yum/yumRepo.py
index a60746b..0db9121 100644
--- a/yum/yumRepo.py
+++ b/yum/yumRepo.py
@@ -814,7 +814,7 @@ class YumRepository(Repository, config.RepoConf):
                     ug = URLGrabber(progress_obj = self.callback, **ugopts)
                     result = ug.urlgrab(url, local, text="%s/metalink" % self)
 
-                except urlgrabber.grabber.URLGrabError, e:
+                except URLGrabError, e:
                     if not os.path.exists(self.metalink_filename):
                         msg = ("Cannot retrieve metalink for repository: %s. "
                                "Please verify its path and try again" % self )
@@ -1836,7 +1836,7 @@ Insufficient space in download directory %s
             ugopts = self._default_grabopts()
             try:
                 fo = urlgrabber.grabber.urlopen(url, **ugopts)
-            except urlgrabber.grabber.URLGrabError, e:
+            except URLGrabError, e:
                 print "Could not retrieve mirrorlist %s error was\n%s: %s" % (url, e.args[0], misc.to_unicode(e.args[1]))
                 fo = None
 
@@ -2000,7 +2000,7 @@ def getMirrorList(mirrorlist, pdict = None):
 
     try:
         fo = urlresolver.urlopen(url, proxies=pdict)
-    except urlgrabber.grabber.URLGrabError, e:
+    except URLGrabError, e:
         print "Could not retrieve mirrorlist %s error was\n%s: %s" % (url, e.args[0], misc.to_unicode(e.args[1]))
         fo = None
 
-- 
1.7.4.4



More information about the Yum-devel mailing list