diff options
| author | Tim Smith <tsmith@chef.io> | 2021-02-02 14:35:23 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-02 14:35:23 -0800 |
| commit | 12843cea0023b72e559517fb32a1d2072d3142f8 (patch) | |
| tree | b1cfe2b636e2b941d0613686312cc9faf211ec6d | |
| parent | afc2da020ce711b41135c716c4124e3b7107780b (diff) | |
| parent | e9f7b83e912280ef6453280f2871919bf07191e0 (diff) | |
| download | chef-12843cea0023b72e559517fb32a1d2072d3142f8.tar.gz | |
Merge pull request #10973 from chef/ohai_bump_16
Update Ohai to 16.10.4
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | lib/chef/shell.rb | 4 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 3ae3fb087f..a751eedfb0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/chef/ohai.git - revision: 1779bc553112ba6bf44e9ac1a03fe3109f4a3145 + revision: ffdd649498b8fe8f6044da8eafa6ab45e6b77b5a branch: 16-stable specs: - ohai (16.8.2) + ohai (16.10.4) chef-config (>= 12.8, < 17) chef-utils (>= 16.0, < 17) ffi (~> 1.9) diff --git a/lib/chef/shell.rb b/lib/chef/shell.rb index 5bff9c0292..89456e86b5 100644 --- a/lib/chef/shell.rb +++ b/lib/chef/shell.rb @@ -352,13 +352,13 @@ module Shell puts "loading configuration: #{config_msg}" # load the config (if we have one) - if !config[:config_file].nil? + unless config[:config_file].nil? if File.exist?(config[:config_file]) && File.readable?(config[:config_file]) Chef::Config.from_file(config[:config_file]) end # even if we couldn't load that, we need to tell Chef::Config what - # the file was so it sets confdir and d_dir and such properly + # the file was so it sets conf dir and d_dir and such properly Chef::Config[:config_file] = config[:config_file] # now attempt to load any relevant dot-dirs diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 235ff440c9..fe6292621e 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -33,16 +33,16 @@ GEM awesome_print (1.8.0) aws-eventstream (1.1.0) aws-partitions (1.422.0) - aws-sdk-core (3.111.2) + aws-sdk-core (3.112.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.41.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-kms (1.42.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.87.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-s3 (1.88.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sigv4 (1.2.2) @@ -287,7 +287,7 @@ GEM octokit (4.20.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) - ohai (16.8.1) + ohai (16.10.4) chef-config (>= 12.8, < 17) chef-utils (>= 16.0, < 17) ffi (~> 1.9) |