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

[Seth Vidal]

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

Modified Files:
	config.py 
Log Message:

make the proxy checking patch actually work.


Index: config.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/config.py,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- config.py	1 Jul 2005 12:56:45 -0000	1.70
+++ config.py	1 Jul 2005 13:05:48 -0000	1.71
@@ -495,9 +495,9 @@
 
     # 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
-    
+    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)