diff options
| author | srb3 <sbrown@chef.io> | 2020-11-08 13:17:26 +0000 |
|---|---|---|
| committer | srb3 <sbrown@chef.io> | 2020-11-08 13:17:26 +0000 |
| commit | 8a16d20be5b3c268d8caa5077b851c0e030ff6d6 (patch) | |
| tree | e9b0c82d9285341fd42f7e7ae1aae1e31e4ba1a2 | |
| parent | 98eb4c822a02650d5e0b2a356c41f4d4492144cf (diff) | |
| download | chef-8a16d20be5b3c268d8caa5077b851c0e030ff6d6.tar.gz | |
simple fix: fix for https://github.com/chef/chef/issues/10607
Signed-off-by: srb3 <sbrown@chef.io>
| -rw-r--r-- | lib/chef/resource/support/client.erb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/resource/support/client.erb b/lib/chef/resource/support/client.erb index d7bbde41f8..4b66c0a2aa 100644 --- a/lib/chef/resource/support/client.erb +++ b/lib/chef/resource/support/client.erb @@ -20,12 +20,12 @@ @policy_group @policy_name @ssl_verify_mode).each do |prop| -%> -<% next if instance_variable_get(prop).nil? || instance_variable_get(prop).empty? -%> +<% next if instance_variable_get(prop).nil? || instance_variable_get(prop).empty? || prop == '@log_location' -%> <%=prop.delete_prefix("@") %> <%= instance_variable_get(prop).inspect %> <% end -%> <%# log_location is special due to STDOUT/STDERR from String -> IO Object -%> <% unless @log_location.nil? %> - <% if @log_location.is_a? String && %w(STDOUT STDERR).include?(@log_location) -%> + <% if (@log_location.is_a? String) && (%w(STDOUT STDERR).include?(@log_location)) -%> log_location <%= @log_location %> <% else -%> log_location <%= @log_location.inspect %> |