summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2020-02-27 10:19:17 -0800
committerGitHub <noreply@github.com>2020-02-27 10:19:17 -0800
commit87b0c1d8defc8873a99a710fbec2e44d26d6d246 (patch)
tree484437827bf7899adf877a576ab3524cf4961403 /lib
parentda8c141b35db7d055f81ebf1d45134f096a0971e (diff)
parentab720d3c5272c765d6afe11257f6359c545d243a (diff)
downloadchef-87b0c1d8defc8873a99a710fbec2e44d26d6d246.tar.gz
Merge pull request #9396 from chef/windows_package_3010
Accept exit code 3010 as valid in windows_package
Diffstat (limited to 'lib')
-rw-r--r--lib/chef/resource/windows_package.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/chef/resource/windows_package.rb b/lib/chef/resource/windows_package.rb
index 3402cb0792..9fac482f9b 100644
--- a/lib/chef/resource/windows_package.rb
+++ b/lib/chef/resource/windows_package.rb
@@ -55,9 +55,11 @@ class Chef
description: "The amount of time (in seconds) to wait before timing out."
# In the past we accepted return code 127 for an unknown reason and 42 because of a bug
- property :returns, [ String, Integer, Array ], default: [ 0 ],
+ # we accept 3010 which means success, but a reboot is necessary
+ property :returns, [ String, Integer, Array ], default: [ 0, 3010 ],
desired_state: false,
- description: "A comma-delimited list of return codes that indicate the success or failure of the package command that was run."
+ description: "A comma-delimited list of return codes that indicate the success or failure of the package command that was run.",
+ default_description: "0 (success) and 3010 (success where a reboot is necessary)"
property :source, String,
coerce: (proc do |s|