Commit33bc6e2

Joshua Timberman

committed

Merge pull requestpoise#24 from wohali/master

COOK-1925: Support SmartOS for Python

2 parentsb78e82b +29ce987 commit33bc6e2Copy full SHA for 33bc6e2

File tree

+10

-2

lines changed

+10

-2

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,12 @@`
`21`	`21`	`default['python']['install_method']='package'`
`22`	`22`
`23`	`23`	`ifpython['install_method'] =='package'`
`24`		`-default['python']['prefix_dir']='/usr'`
	`24`	`+caseplatform`
	`25`	`+when"smartos"`
	`26`	`+default['python']['prefix_dir']='/opt/local'`
	`27`	`+else`
	`28`	`+default['python']['prefix_dir']='/usr'`
	`29`	`+end`
`25`	`30`	`else`
`26`	`31`	`default['python']['prefix_dir']='/usr/local'`
`27`	`32`	`end`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,6 @@`
`14`	`14`	`recipe"python::pip","Installs pip from source."`
`15`	`15`	`recipe"python::virtualenv","Installs virtualenv using the python_pip resource."`
`16`	`16`
`17`		`-%w{debianubuntucentosredhatfedorafreebsd}.eachdo \|os\|`
	`17`	`+%w{debianubuntucentosredhatfedorafreebsdsmartos}.eachdo \|os\|`
`18`	`18`	`supportsos`
`19`	`19`	`end`

Lines changed: 1 addition & 0 deletions

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@`
`20`	`20`
`21`	`21`	`ifplatform_family?("rhel")`
`22`	`22`	`pip_binary="/usr/bin/pip"`
	`23`	`+elsifplatform_family?("smartos")`
	`24`	`+pip_binary="/opt/local/bin/pip"`
`23`	`25`	`else`
`24`	`26`	`pip_binary="/usr/local/bin/pip"`
`25`	`27`	`end`

Comments

(0)