diff options
| author | sawanoboly <sawanoboriyu@higanworks.com> | 2014-06-26 15:41:04 +0900 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2014-08-21 11:44:46 -0700 |
| commit | 68481a5a2f4cc065a5f4cab82506455118c4760d (patch) | |
| tree | e306165533c3229bd5f619df1cf5ed6e327d4f55 | |
| parent | eff4d2b6e712aa6cb76611d1ad8e317a1f962826 (diff) | |
| download | chef-68481a5a2f4cc065a5f4cab82506455118c4760d.tar.gz | |
fix: remove oldline and check avail.
| -rw-r--r-- | lib/chef/provider/git.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/chef/provider/git.rb b/lib/chef/provider/git.rb index 744c8a236d..ee52cbcd69 100644 --- a/lib/chef/provider/git.rb +++ b/lib/chef/provider/git.rb @@ -283,8 +283,7 @@ class Chef env['GIT_SSH'] = @new_resource.ssh_wrapper if @new_resource.ssh_wrapper 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[:environment] = @new_resource.environment ? env.merge(@new_resource.environment) : env run_opts end |