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

Seth Vidal skvidal at login.linux.duke.edu
Fri Jul 1 12:56:48 UTC 2005


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

Modified Files:
	config.py 
Log Message:

check if the proxy is anything sensible


Index: config.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/config.py,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- config.py	22 Jun 2005 04:27:46 -0000	1.69
+++ config.py	1 Jul 2005 12:56:45 -0000	1.70
@@ -493,6 +493,12 @@
             raise Errors.ConfigError, 'gpgkey must be ftp, http[s], or file URL: %s' % gpgkey
     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
+    
+    
     excludelist = cfgparser._getoption(section, 'exclude', [])
     excludelist = variableReplace(yumconfig.yumvar, excludelist)
     excludelist = parseList(excludelist)




More information about the Yum-cvs-commits mailing list