Permalink
Browse files

Make it work with our squid http proxy

  • Loading branch information...
1 parent bfd9b87 commit dd9021a8babe63c5a66b60a53ee81e89440927b8 @saltycrane committed Apr 14, 2012
Showing with 4 additions and 1 deletion.
  1. +2 −0 readthedocs/projects/utils.py
  2. +2 −1 readthedocs/settings/base.py
View
2 readthedocs/projects/utils.py
@@ -42,6 +42,8 @@ def run(*commands):
del environment['DJANGO_SETTINGS_MODULE']
if environment.has_key('PYTHONPATH'):
del environment['PYTHONPATH']
+ # this needs to be local to the pip command because it breaks the internal http api
+ environment['http_proxy'] = getattr(settings, 'HTTP_PROXY', '')
cwd = os.getcwd()
if not commands:
raise ValueError("run() requires one or more command-line strings")
View
3 readthedocs/settings/base.py
@@ -207,4 +207,5 @@
}
}
-
+# this needs to be local to the pip command because it breaks the internal http api
+HTTP_PROXY = 'http://squid:3128'

0 comments on commit dd9021a

Please sign in to comment.