summaryrefslogtreecommitdiff
path: root/lib/chef
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2020-12-15 16:55:58 -0800
committerGitHub <noreply@github.com>2020-12-15 16:55:58 -0800
commit2f0310b8d774961f1abeca57979d76aa4c0e0845 (patch)
tree2488265cf201c8823c0e7546f158e61a95d0366c /lib/chef
parent56014f889a06e73883e925a87b5708dbc8b52e11 (diff)
parente46b278a6c9acb8d3b48b5db487b52bbc8a9485c (diff)
downloadchef-2f0310b8d774961f1abeca57979d76aa4c0e0845.tar.gz
Merge pull request #10743 from chef/timeout
Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to 'lib/chef')
-rw-r--r--lib/chef/resource/locale.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/resource/locale.rb b/lib/chef/resource/locale.rb
index 5e4a63c06b..fafa1a5caa 100644
--- a/lib/chef/resource/locale.rb
+++ b/lib/chef/resource/locale.rb
@@ -125,7 +125,7 @@ class Chef
# @raise [Mixlib::ShellOut::ShellCommandFailed] not a supported language or locale
#
def generate_locales
- shell_out!("locale-gen #{unavailable_locales.join(" ")}")
+ shell_out!("locale-gen #{unavailable_locales.join(" ")}", timeout: 1800)
end
# Sets the system locale for the current computer.