From f4b6af68d5f279949505a99d1df009ba5e021660 Mon Sep 17 00:00:00 2001 From: Andrei Coman Date: Mon, 6 Jan 2014 10:42:04 +0200 Subject: [PATCH 1/3] COOK-4183 Set $HOME to new owner as in the pip provider when shelling out --- providers/virtualenv.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/providers/virtualenv.rb b/providers/virtualenv.rb index 5a4d3dd..f0b9370 100644 --- a/providers/virtualenv.rb +++ b/providers/virtualenv.rb @@ -34,10 +34,9 @@ def whyrun_supported? end Chef::Log.info("Creating virtualenv #{new_resource} at #{new_resource.path}") interpreter = new_resource.interpreter ? " --python=#{new_resource.interpreter}" : "" - execute "#{virtualenv_cmd}#{interpreter} #{new_resource.options} #{new_resource.path}" do - user new_resource.owner if new_resource.owner - group new_resource.group if new_resource.group - end + options = { :user => new_resource.owner, :group => new_resource.group } + options[:environment] = { 'HOME' => ::File.expand_path("~#{new_resource.owner}") } if new_resource.owner + shell_out!("#{virtualenv_cmd}#{interpreter} #{new_resource.options} #{new_resource.path}", options) new_resource.updated_by_last_action(true) end end From b01c4a5320b0c412e49e14dee38cb312b68053a7 Mon Sep 17 00:00:00 2001 From: Guilhem Lettron Date: Wed, 8 Jan 2014 10:10:27 +0100 Subject: [PATCH 2/3] Revert "COOK-4183 Set $HOME to new owner as in the pip provider when shelling out" This reverts commit f4b6af68d5f279949505a99d1df009ba5e021660. --- providers/virtualenv.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/providers/virtualenv.rb b/providers/virtualenv.rb index f0b9370..5a4d3dd 100644 --- a/providers/virtualenv.rb +++ b/providers/virtualenv.rb @@ -34,9 +34,10 @@ def whyrun_supported? end Chef::Log.info("Creating virtualenv #{new_resource} at #{new_resource.path}") interpreter = new_resource.interpreter ? " --python=#{new_resource.interpreter}" : "" - options = { :user => new_resource.owner, :group => new_resource.group } - options[:environment] = { 'HOME' => ::File.expand_path("~#{new_resource.owner}") } if new_resource.owner - shell_out!("#{virtualenv_cmd}#{interpreter} #{new_resource.options} #{new_resource.path}", options) + execute "#{virtualenv_cmd}#{interpreter} #{new_resource.options} #{new_resource.path}" do + user new_resource.owner if new_resource.owner + group new_resource.group if new_resource.group + end new_resource.updated_by_last_action(true) end end From e822c7121612ebd69e05c80d7f1dc2502462d51c Mon Sep 17 00:00:00 2001 From: Guilhem Lettron Date: Wed, 8 Jan 2014 10:13:05 +0100 Subject: [PATCH 3/3] Set $HOME to new owner --- providers/virtualenv.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/providers/virtualenv.rb b/providers/virtualenv.rb index 5a4d3dd..904c1b4 100644 --- a/providers/virtualenv.rb +++ b/providers/virtualenv.rb @@ -37,6 +37,7 @@ def whyrun_supported? execute "#{virtualenv_cmd}#{interpreter} #{new_resource.options} #{new_resource.path}" do user new_resource.owner if new_resource.owner group new_resource.group if new_resource.group + environment ({ 'HOME' => ::Dir.home(new_resource.owner) }) if new_resource.owner end new_resource.updated_by_last_action(true) end