Commit6be1a46

committed

[COOK-4271] Add ability in pip lwrp to send custom env vars

1 parent4920ddd commit6be1a46Copy full SHA for 6be1a46

File tree

-1

lines changed

-1

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,10 @@ def remove_package(version)`
`151`	`151`
`152`	`152`	`defpip_cmd(subcommand,version='')`
`153`	`153`	`options={:timeout=>new_resource.timeout,:user=>new_resource.user,:group=>new_resource.group}`
`154`		`-options[:environment]={'HOME'=> ::File.expand_path("~#{new_resource.user}")}ifnew_resource.user`
	`154`	`+environment=Hash.new`
	`155`	`+environment.merge!({'HOME'=> ::File.expand_path("~#{new_resource.user}")})ifnew_resource.user`
	`156`	`+environment.merge!(new_resource.environment)ifnew_resource.environment`
	`157`	`+options[:environment]=environment`
`155`	`158`	`shell_out!("#{which_pip(new_resource)}#{subcommand}#{new_resource.options}#{new_resource.package_name}#{version}",options)`
`156`	`159`	`end`
`157`	`160`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,3 +34,4 @@ def initialize(*args)`
`34`	`34`	`attribute:user,:regex=>Chef::Config[:user_valid_regex]`
`35`	`35`	`attribute:group,:regex=>Chef::Config[:group_valid_regex]`
`36`	`36`	`attribute:options,:kind_of=>String,:default=>''`
	`37`	`+attribute:environment,:kind_of=>Hash,:default=>{}`

Comments

(0)