Commita553743

committed

fix python install from source to work with chef 12

Also update the test suite to reflect the right python version

1 parent8b3fd0f commita553743Copy full SHA for a553743

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,8 @@`
`35`	`35`
`36`	`36`	`default['python']['url']='http://www.python.org/ftp/python'`
`37`	`37`	`default['python']['version']='2.7.7'`
`38`		`-default['python']['checksum']='3b477554864e616a041ee4d7cef9849751770bc7c39adaf78a94ea145c488059'`
`39`		`-default['python']['configure_options']=%W{--prefix=#{python['prefix_dir']}}`
	`38`	`+default['python']['checksum']='7f49c0a6705ad89d925181e27d0aaa025ee4731ce0de64776c722216c3e66c42'`
	`39`	`+default['python']['configure_options']=%W{--prefix=#{node['python']['prefix_dir']}}`
`40`	`40`	`default['python']['make_options']=%W{install}`
`41`	`41`
`42`	`42`	`default['python']['pip_location']="#{node['python']['prefix_dir']}/bin/pip"`

Lines changed: 2 additions & 2 deletions

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`	`}`

Comments

(0)