Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Make default attribute name more obvious.

  • Loading branch information...
commit 0d076972873c977545578bfd1d1bd6201288619d 1 parent b294961
@benjaminws benjaminws authored jtimberman committed
Showing with 5 additions and 4 deletions.
  1. +2 −2 python/attributes/default.rb
  2. +3 −2 python/recipes/pip.rb
View
4 python/attributes/default.rb
@@ -18,10 +18,10 @@
# limitations under the License.
#
-# Version of python to use when installing distribute/pip
+# Version of python to use when installing distribute
# default is '', which uses the 'python' binary.
# example value = '2.6' which will use the python2.6 binary
-default['python']['base_version'] = ''
+default['python']['distribute_install_py_version'] = ''
default['python']['install_method'] = 'package'
View
5 python/recipes/pip.rb
@@ -28,11 +28,12 @@
not_if "which pip"
end
-base_version = node['python']['base_version']
+use_version = node['python']['distribute_install_py_version']
+
bash "install-pip" do
cwd Chef::Config[:file_cache_path]
code <<-EOF
- python#{base_version} distribute_setup.py
+ python#{use_version} distribute_setup.py
easy_install pip
EOF
not_if "which pip"
Please sign in to comment.
Something went wrong with that request. Please try again.