diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2015-06-02 16:36:46 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2015-06-02 18:52:12 -0700 |
| commit | 23e3c799803ac1800149e27271c6168539cea25e (patch) | |
| tree | c6394473fc32f9b30b50a309de765940a21d2c8c /lib/chef/provider/package/homebrew.rb | |
| parent | 025cabb7158fb02a89250ef91cc94ce3b3c38648 (diff) | |
| download | chef-23e3c799803ac1800149e27271c6168539cea25e.tar.gz | |
fix package timeout attribute
updates all the shell_out calls to respect the timeout which is passed
on the new_resource.
the old `Chef::Config` yum timeout values are still respected and will
override the default.
the default of 900 seconds is preserved.
Diffstat (limited to 'lib/chef/provider/package/homebrew.rb')
| -rw-r--r-- | lib/chef/provider/package/homebrew.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/chef/provider/package/homebrew.rb b/lib/chef/provider/package/homebrew.rb index e2bc24d1ec..beede1c916 100644 --- a/lib/chef/provider/package/homebrew.rb +++ b/lib/chef/provider/package/homebrew.rb @@ -125,7 +125,8 @@ class Chef homebrew_user = Etc.getpwuid(homebrew_uid) Chef::Log.debug "Executing '#{command}' as user '#{homebrew_user.name}'" - output = shell_out!(command, :timeout => 1800, :user => homebrew_uid, :environment => { 'HOME' => homebrew_user.dir, 'RUBYOPT' => nil }) + # FIXME: this 1800 second default timeout should be deprecated + output = shell_out_with_timeout!(command, :timeout => 1800, :user => homebrew_uid, :environment => { 'HOME' => homebrew_user.dir, 'RUBYOPT' => nil }) output.stdout.chomp end |