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

skvidal at osuosl.org skvidal at osuosl.org
Tue Jan 11 16:07:10 UTC 2011


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

New commits:
commit 0ced372c3f8790c48a3737e2e77b80435a2e9a8a
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Tue Jan 11 11:06:45 2011 -0500

    specific exceptions not a global from urlparse.urlparse()

diff --git a/yum/yumRepo.py b/yum/yumRepo.py
index 36b7c7d..6ba058c 100644
--- a/yum/yumRepo.py
+++ b/yum/yumRepo.py
@@ -681,7 +681,7 @@ class YumRepository(Repository, config.RepoConf):
             try:
                 # This started throwing ValueErrors, BZ 666826
                 (s,b,p,q,f,o) = urlparse.urlparse(url)
-            except:
+            except (ValueError, IndexError, KeyError), e:
                 s = 'blah'
 
             if s not in ['http', 'ftp', 'file', 'https']:


More information about the Yum-commits mailing list