diff options
| author | Tim Smith <tsmith@chef.io> | 2020-11-05 10:54:53 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-05 10:54:53 -0800 |
| commit | 9530de8f57c90a9e24738953aaf2ed5c8b199535 (patch) | |
| tree | 9493ad6b0b14bb81be00898f735ac0a3c7b6e4e1 | |
| parent | e7eb8fe34f1245b030711a1af79e7b642a366dfb (diff) | |
| parent | fa6614b06d26f987d585dd97dd4de14af92ce2ea (diff) | |
| download | chef-9530de8f57c90a9e24738953aaf2ed5c8b199535.tar.gz | |
Merge pull request #10601 from chef/compact
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | lib/chef/exceptions.rb | 2 | ||||
| -rw-r--r-- | lib/chef/provider/package/chocolatey.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/chef/exceptions.rb b/lib/chef/exceptions.rb index 16134fe44b..e0b534c3d3 100644 --- a/lib/chef/exceptions.rb +++ b/lib/chef/exceptions.rb @@ -451,7 +451,7 @@ class Chef attr_reader :wrapped_errors def initialize(*errors) - errors = errors.select { |e| !e.nil? } + errors = errors.compact output = "Found #{errors.size} errors, they are stored in the backtrace" @wrapped_errors = errors super output diff --git a/lib/chef/provider/package/chocolatey.rb b/lib/chef/provider/package/chocolatey.rb index 156568e584..06db3c2979 100644 --- a/lib/chef/provider/package/chocolatey.rb +++ b/lib/chef/provider/package/chocolatey.rb @@ -79,7 +79,7 @@ class Chef name_versions_to_install = desired_name_versions.select { |n, v| lowercase_names(names).include?(n) } name_nil_versions = name_versions_to_install.select { |n, v| v.nil? } - name_has_versions = name_versions_to_install.reject { |n, v| v.nil? } + name_has_versions = name_versions_to_install.compact # choco does not support installing multiple packages with version pins name_has_versions.each do |name, version| @@ -101,7 +101,7 @@ class Chef name_versions_to_install = desired_name_versions.select { |n, v| lowercase_names(names).include?(n) } name_nil_versions = name_versions_to_install.select { |n, v| v.nil? } - name_has_versions = name_versions_to_install.reject { |n, v| v.nil? } + name_has_versions = name_versions_to_install.compact # choco does not support installing multiple packages with version pins name_has_versions.each do |name, version| |