Merge pull request poise#133 from chantra/fix_chef12

coderanger · coderanger · commit 01e511b8564a · 2014-12-12T18:19:00.000-08:00
fix python install from source to work with chef 12
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -35,8 +35,8 @@
 
 default['python']['url'] = 'http://www.python.org/ftp/python'
 default['python']['version'] = '2.7.7'
-default['python']['checksum'] = '3b477554864e616a041ee4d7cef9849751770bc7c39adaf78a94ea145c488059'
-default['python']['configure_options'] = %W{--prefix=#{python['prefix_dir']}}
+default['python']['checksum'] = '7f49c0a6705ad89d925181e27d0aaa025ee4731ce0de64776c722216c3e66c42'
+default['python']['configure_options'] = %W{--prefix=#{node['python']['prefix_dir']}}
 default['python']['make_options'] = %W{install}
 
 default['python']['pip_location'] = "#{node['python']['prefix_dir']}/bin/pip"
diff --git a/test/integration/source/bats/source.bats b/test/integration/source/bats/source.bats
@@ -4,6 +4,6 @@
     [ -x "/usr/local/bin/python" ]
 }
 
-@test "python should be version 2.7.5" {
-    /usr/local/bin/python -c 'import sys; print sys.version' | grep '2.7.5'
+@test "python should be version 2.7.7" {
+    /usr/local/bin/python -c 'import sys; print sys.version' | grep '2.7.7'
 }

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@`
`4`	`4`	`[ -x "/usr/local/bin/python" ]`
`5`	`5`	`}`
`6`	`6`
`7`		`-@test "python should be version 2.7.5" {`
`8`		`- /usr/local/bin/python -c 'import sys; print sys.version' \| grep '2.7.5'`
	`7`	`+@test "python should be version 2.7.7" {`
	`8`	`+ /usr/local/bin/python -c 'import sys; print sys.version' \| grep '2.7.7'`
`9`	`9`	`}`