diff options
| author | John McCrae <john.mccrae@progress.com> | 2022-03-25 16:10:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-25 16:10:40 -0700 |
| commit | 1a8e7d625c72fe36c763d3352de23f4476391be4 (patch) | |
| tree | 1551701f632a05d067441193183f1d34f3de1e89 | |
| parent | 8c11b691afccdffa3b43440e7746ce8dc580e7e5 (diff) | |
| parent | c27f73188f57e91d56b6c22384f67eab20328c8c (diff) | |
| download | chef-1a8e7d625c72fe36c763d3352de23f4476391be4.tar.gz | |
Merge pull request #12722 from chef/jfm/relativity_bug
| -rw-r--r-- | Gemfile.lock | 10 | ||||
| -rw-r--r-- | lib/chef/provider/package/powershell.rb | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 63b0291baa..230eb0e238 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -154,7 +154,7 @@ GEM mixlib-shellout (>= 2.0, < 4.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.569.0) + aws-partitions (1.570.0) aws-sdk-core (3.130.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) @@ -246,7 +246,7 @@ GEM domain_name (~> 0.5) httpclient (2.8.3) iniparse (1.5.0) - inspec-core (4.56.17) + inspec-core (4.56.19) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -269,8 +269,8 @@ GEM train-core (~> 3.0) tty-prompt (~> 0.17) tty-table (~> 0.10) - inspec-core-bin (4.56.17) - inspec-core (= 4.56.17) + inspec-core-bin (4.56.19) + inspec-core (= 4.56.19) io-wait (0.2.1) ipaddress (0.8.3) iso8601 (0.13.0) @@ -525,4 +525,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.3.6 + 2.3.5 diff --git a/lib/chef/provider/package/powershell.rb b/lib/chef/provider/package/powershell.rb index 2fe6cc2abc..caccb501d9 100644 --- a/lib/chef/provider/package/powershell.rb +++ b/lib/chef/provider/package/powershell.rb @@ -56,7 +56,7 @@ class Chef names.each_with_index do |name, index| cmd = powershell_exec(build_powershell_package_command("Install-Package '#{name}'", versions[index]), timeout: new_resource.timeout) next if cmd.nil? - raise Chef::Exceptions::PowershellCmdletException, "Failed to install package due to catalog signing error, use skip_publisher_check to force install" if /SkipPublisherCheck/.match?(cmd.error) + raise Chef::Exceptions::PowershellCmdletException, "Failed to install package due to catalog signing error, use skip_publisher_check to force install" if /SkipPublisherCheck/.match?(cmd.error!) end end |