Minor fixes in python cookbooks. 'install_path' wouldn't resolve to an actual file, needed an index specified on version.split(). Add in a way to specify which version of python to use when installing distribute (on centos, defaults to 2.4 which virtualenv doesn't work well with).

benjaminws · jtimberman · commit f526b9898b49 · 2012-01-18T20:44:38.000-07:00
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -18,6 +18,11 @@
 # limitations under the License.
 #
 
+# Version of python to use when installing distribute/pip
+# default is '', which uses the 'python' binary.
+# example value = '2.6' which will use the python2.6 binary
+default['python']['base_version'] = ''
+
 default['python']['install_method'] = 'package'
 
 default['python']['url'] = 'http://www.python.org/ftp/python'
diff --git a/recipes/pip.rb b/recipes/pip.rb
@@ -28,10 +28,11 @@
   not_if "which pip"
 end
 
+base_version = node['python']['base_version']
 bash "install-pip" do
   cwd Chef::Config[:file_cache_path]
   code <<-EOF
-  python distribute_setup.py
+  python#{base_version} distribute_setup.py
   easy_install pip
   EOF
   not_if "which pip"
diff --git a/recipes/source.rb b/recipes/source.rb
@@ -32,7 +32,7 @@
 end
 
 version = node['python']['version']
-install_path = "#{node['python']['prefix_dir']}/lib/python#{version.split(/(^\d+\.\d+)/)}"
+install_path = "#{node['python']['prefix_dir']}/lib/python#{version.split(/(^\d+\.\d+)/)[1]}"
 
 remote_file "#{Chef::Config[:file_cache_path]}/Python-#{version}.tar.bz2" do
   source "#{node['python']['url']}/#{version}/Python-#{version}.tar.bz2"
