diff options
author | John McCrae <john.mccrae@progress.com> | 2022-03-25 16:04:27 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-25 16:04:27 -0700 |
commit | 7bbd932c3ec50c40ab3667511089ebe9e94f8fe7 (patch) | |
tree | 4401bb72511c3e4f2794088c7cb4aeb0bb7ac57d | |
parent | cfd064abc58d37f165966069c9c26915d7748aac (diff) | |
parent | 57f421073571d43da4098fc4607ece1543c74246 (diff) | |
download | chef-7bbd932c3ec50c40ab3667511089ebe9e94f8fe7.tar.gz |
Merge pull request #12721 from chef/chef17/relativity
-rw-r--r-- | Gemfile.lock | 2 | ||||
-rw-r--r-- | lib/chef/provider/package/powershell.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 5b47765f20..1644c5763e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -470,4 +470,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.3.7 + 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 |