diff options
| author | Corey Hemminger <hemminger@hotmail.com> | 2021-12-27 17:35:43 -0600 |
|---|---|---|
| committer | Corey Hemminger <hemminger@hotmail.com> | 2021-12-27 17:35:43 -0600 |
| commit | dbd9e02a67ed5d8cfa4534c6025015d87ca34ccc (patch) | |
| tree | b5a0d10311998c9a9156453cfea1ddbebeb05953 | |
| parent | 2a84babf282ef59e1515efb66be2620aa2fb3f4a (diff) | |
| download | chef-dbd9e02a67ed5d8cfa4534c6025015d87ca34ccc.tar.gz | |
linting fix and safe navigation fix
Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
| -rw-r--r-- | kitchen-tests/cookbooks/end_to_end/recipes/_chef_client_config.rb | 2 | ||||
| -rw-r--r-- | lib/chef/resource/chef_client_config.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/_chef_client_config.rb b/kitchen-tests/cookbooks/end_to_end/recipes/_chef_client_config.rb index 8ce31693d6..31dac49fc6 100644 --- a/kitchen-tests/cookbooks/end_to_end/recipes/_chef_client_config.rb +++ b/kitchen-tests/cookbooks/end_to_end/recipes/_chef_client_config.rb @@ -1,6 +1,6 @@ chef_client_config "Create chef-client's client.rb" do chef_server_url "https://localhost" - log_location windows? ? 'C:\\chef\\log_test\client.log' : '/var/log/chef/log_test/client.log' + log_location windows? ? "C:\\chef\\log_test\\client.log" : "/var/log/chef/log_test/client.log" chef_license "accept" ohai_optional_plugins %i{Passwd Lspci Sysctl} ohai_disabled_plugins %i{Sessions Interrupts} diff --git a/lib/chef/resource/chef_client_config.rb b/lib/chef/resource/chef_client_config.rb index 03e6e365bf..6709e7b7a6 100644 --- a/lib/chef/resource/chef_client_config.rb +++ b/lib/chef/resource/chef_client_config.rb @@ -257,7 +257,7 @@ class Chef new_resource.file_cache_path, ::File.join(new_resource.config_directory, "client.d"), ::File.dirname(new_resource.pid_file), - ].each do |dir_path| + ]&.each do |dir_path| next if dir_path.nil? next if ::Dir.exist?(dir_path) |