[yum-cvs] yum/yum config.py,1.71,1.72

[Seth Vidal]

Update of /home/groups/yum/cvs/yum/yum
In directory login:/tmp/cvs-serv9896/yum

Modified Files:
	config.py 
Log Message:

<sigh> fix proxy check if proxy is None


Index: config.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/config.py,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- config.py	1 Jul 2005 13:05:48 -0000	1.71
+++ config.py	1 Jul 2005 20:40:34 -0000	1.72
@@ -494,10 +494,11 @@
     thisrepo.set('gpgkey', gpgkeys)
 
     # check out the proxy url
-    (s,b,p,q,f,o) = urlparse.urlparse(thisrepo.proxy)
-    if s not in ('http', 'ftp', 'https'):
-        raise Errors.ConfigError, 'proxy must be ftp or http[s] URL: %s' % thisrepo.proxy
-        thisrepo.set('proxy', None)
+    if thisrepo.proxy:
+        (s,b,p,q,f,o) = urlparse.urlparse(thisrepo.proxy)
+        if s not in ('http', 'ftp', 'https'):
+            raise Errors.ConfigError, 'proxy must be ftp or http[s] URL: %s' % thisrepo.proxy
+            thisrepo.set('proxy', None)
     
     excludelist = cfgparser._getoption(section, 'exclude', [])
     excludelist = variableReplace(yumconfig.yumvar, excludelist)