diff options
| author | Jack Foy <jfoy@whitepages.com> | 2013-06-06 15:06:15 -0700 |
|---|---|---|
| committer | Jack Foy <jfoy@whitepages.com> | 2013-07-19 14:06:22 -0700 |
| commit | 3bdbd6bf47d4f0c407c625a987c3b9336624f8d7 (patch) | |
| tree | aafb56d4e620464be0fab4ea385679956b120069 /lib/chef | |
| parent | b1112b5e43e0cce8245772cedb0d593192971bb1 (diff) | |
| download | chef-3bdbd6bf47d4f0c407c625a987c3b9336624f8d7.tar.gz | |
Use timeout attribute in git and subversion providers
Diffstat (limited to 'lib/chef')
| -rw-r--r-- | lib/chef/provider/git.rb | 1 | ||||
| -rw-r--r-- | lib/chef/provider/subversion.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/chef/provider/git.rb b/lib/chef/provider/git.rb index 7cda1a873a..b22004eda0 100644 --- a/lib/chef/provider/git.rb +++ b/lib/chef/provider/git.rb @@ -273,6 +273,7 @@ class Chef run_opts[:group] = @new_resource.group if @new_resource.group run_opts[:environment] = {"GIT_SSH" => @new_resource.ssh_wrapper} if @new_resource.ssh_wrapper run_opts[:log_tag] = @new_resource.to_s + run_opts[:timeout] = @new_resource.timeout if @new_resource.timeout run_opts end diff --git a/lib/chef/provider/subversion.rb b/lib/chef/provider/subversion.rb index e1f87b4dd8..3b0c202b10 100644 --- a/lib/chef/provider/subversion.rb +++ b/lib/chef/provider/subversion.rb @@ -156,6 +156,7 @@ class Chef def run_options(run_opts={}) run_opts[:user] = @new_resource.user if @new_resource.user run_opts[:group] = @new_resource.group if @new_resource.group + run_opts[:timeout] = @new_resource.timeout if @new_resource.timeout run_opts end |