Commit6e0afef

committed

Slight cleanup for env code.

1 parent591ba73 commit6e0afefCopy full SHA for 6e0afef

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -152,8 +152,8 @@ def remove_package(version)`
`152`	`152`	`defpip_cmd(subcommand,version='')`
`153`	`153`	`options={:timeout=>new_resource.timeout,:user=>new_resource.user,:group=>new_resource.group}`
`154`	`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`
	`155`	`+environment['HOME']=Dir.home(new_resource.user)ifnew_resource.user`
	`156`	`+environment.merge!(new_resource.environment)ifnew_resource.environment && !new_resource.environment.empty?`
`157`	`157`	`options[:environment]=environment`
`158`	`158`	`shell_out!("#{which_pip(new_resource)}#{subcommand}#{new_resource.options}#{new_resource.package_name}#{version}",options)`
`159`	`159`	`end`

Comments

(0)