Merge pull request poise#30 from aweber/master

Joshua Timberman · Joshua Timberman · commit b92d5ca8090a · 2013-02-27T19:07:44.000-08:00
[COOK-2449] Make the distribute download location an attribute
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -37,3 +37,6 @@
 default['python']['version'] = '2.7.1'
 default['python']['checksum'] = '80e387bcf57eae8ce26726753584fd63e060ec11682d1145af921e85fd612292'
 default['python']['configure_options'] = %W{--prefix=#{python['prefix_dir']}}
+
+default['python']['distribute_script_url'] = 'http://python-distribute.org/distribute_setup.py'
+default['python']['distribute_option']['download_base'] = 'https://pypi.python.org/packages/source/d/distribute/'
diff --git a/recipes/pip.rb b/recipes/pip.rb
@@ -31,15 +31,15 @@
 # http://stackoverflow.com/questions/4324558/whats-the-proper-way-to-install-pip-virtualenv-and-distribute-for-python
 # https://bitbucket.org/ianb/pip/issue/104/pip-uninstall-on-ubuntu-linux
 remote_file "#{Chef::Config[:file_cache_path]}/distribute_setup.py" do
-  source "http://python-distribute.org/distribute_setup.py"
+  source node['python']['distribute_script_url']
   mode "0644"
   not_if { ::File.exists?(pip_binary) }
 end
 
 execute "install-pip" do
   cwd Chef::Config[:file_cache_path]
   command <<-EOF
-  #{node['python']['binary']} distribute_setup.py
+  #{node['python']['binary']} distribute_setup.py --download-base=#{node['python']['distribute_option']['download_base']}
   #{::File.dirname(pip_binary)}/easy_install pip
   EOF
   not_if { ::File.exists?(pip_binary) }
