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

[Seth Vidal]

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

Modified Files:
      Tag: yum-2_4_X
	config.py 
Log Message:

fix bugzilla #514 - allow proxy string in repos to be _none_


Index: config.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/config.py,v
retrieving revision 1.72
retrieving revision 1.72.2.1
diff -u -r1.72 -r1.72.2.1
--- config.py	1 Jul 2005 20:40:34 -0000	1.72
+++ config.py	7 Nov 2005 00:26:52 -0000	1.72.2.1
@@ -495,10 +495,13 @@
 
     # check out the proxy url
     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
+        if thisrepo.proxy.lower() == "_none_":
             thisrepo.set('proxy', None)
+        else:
+            (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)