From 96c5155472824d6c9e8fcb2b5c7283bcf9abf483 Mon Sep 17 00:00:00 2001 From: Salim Alam Date: Wed, 23 Mar 2016 14:10:21 -0700 Subject: Use Chef::Config.proxy_uri --- lib/chef/provider/subversion.rb | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'lib/chef/provider/subversion.rb') diff --git a/lib/chef/provider/subversion.rb b/lib/chef/provider/subversion.rb index 287a9f64a1..ea32283bc9 100644 --- a/lib/chef/provider/subversion.rb +++ b/lib/chef/provider/subversion.rb @@ -197,18 +197,13 @@ class Chef end def proxy - %w{http https}.each { |p| - if @new_resource.repository.start_with?("#{p}:") && - ENV["#{p}_proxy"] != nil && - !fuzzy_hostname_match_any?(URI.parse(@new_resource.repository).host, ENV["no_proxy"]) - proxy_uri = URI.parse(ENV["#{p}_proxy"]) - result = "--config-option servers:global:http-proxy-host=#{proxy_uri.host} " - result << "--config-option servers:global:http-proxy-port=#{proxy_uri.port} " - return result - end - } + repo_uri = URI.parse(@new_resource.repository) + proxy_uri = Chef::Config.proxy_uri(repo_uri.scheme, repo_uri.host, repo_uri.port) + return "" if proxy_uri.nil? - "" + result = "--config-option servers:global:http-proxy-host=#{proxy_uri.host} " + result << "--config-option servers:global:http-proxy-port=#{proxy_uri.port} " + result end def scm(*args) -- cgit v1.2.1