summaryrefslogtreecommitdiff
path: root/lib/chef/provider/git.rb
diff options
context:
space:
mode:
authorsawanoboly <sawanoboriyu@higanworks.com>2014-06-26 14:53:30 +0900
committerLamont Granquist <lamont@scriptkiddie.org>2014-08-21 11:44:46 -0700
commiteff4d2b6e712aa6cb76611d1ad8e317a1f962826 (patch)
tree24c45bfe3e533313a158425cb0d3b931f5f301e0 /lib/chef/provider/git.rb
parentb49767dd1ed9c778f94bef597e52a61d48491b50 (diff)
downloadchef-eff4d2b6e712aa6cb76611d1ad8e317a1f962826.tar.gz
add_env_to_scm_resource
Diffstat (limited to 'lib/chef/provider/git.rb')
-rw-r--r--lib/chef/provider/git.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/chef/provider/git.rb b/lib/chef/provider/git.rb
index 525249a726..744c8a236d 100644
--- a/lib/chef/provider/git.rb
+++ b/lib/chef/provider/git.rb
@@ -284,6 +284,7 @@ class Chef
run_opts[:log_tag] = @new_resource.to_s
run_opts[:timeout] = @new_resource.timeout if @new_resource.timeout
run_opts[:environment] = env unless env.empty?
+ run_opts[:environment] = env.merge(@new_resource.environment)
run_opts
end