[yum-commits] yum/config.py

[zpavlas at osuosl.org]

 yum/config.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f32d39f9b00765c00ffcd1b719db1d63d9d7aa1f
Author: Zdenek Pavlas <zpavlas at redhat.com>
Date:   Thu Apr 18 15:55:06 2013 +0200

    support socks4/5 proxies.  BZ 428588
    
    http://lists.baseurl.org/pipermail/yum/2013-February/023923.html
    
    curl supports socks proxies via the same setopt(PROXY, url) API
    we already use for ftp/http/https proxies, so it's pretty easy.

diff --git a/yum/config.py b/yum/config.py
index 438cb88..ec7ba80 100644
--- a/yum/config.py
+++ b/yum/config.py
@@ -735,7 +735,8 @@ class YumConf(StartupConf):
     commands = ListOption()
     exclude = ListOption()
     failovermethod = Option(__main_failovermethod_default__)
-    proxy = UrlOption(default=False, schemes=('http', 'ftp', 'https'), allow_none=True)
+    proxy = UrlOption(default=False, schemes=('http', 'ftp', 'https',
+        'socks4', 'socks4a', 'socks5', 'socks5h'), allow_none=True)
     proxy_username = Option()
     proxy_password = Option()
     username = Option()