summaryrefslogtreecommitdiff
path: root/lib/chef/http
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2016-03-10 11:02:23 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2016-03-10 11:02:23 -0800
commit6c99e45209183f006d02a96e6fc7908e69836d78 (patch)
tree2e7a1aa80dd218a551678d6ac08a11e7503093fb /lib/chef/http
parent615f2889ac732ac8435f69f8c9dfdae6f778edb6 (diff)
downloadchef-6c99e45209183f006d02a96e6fc7908e69836d78.tar.gz
s/escape_glob/escape_glob_dir/lcg/fix-escape-glob
Removes all remaining references to the deprecated escape_glob helper routine.
Diffstat (limited to 'lib/chef/http')
-rw-r--r--lib/chef/http/ssl_policies.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/http/ssl_policies.rb b/lib/chef/http/ssl_policies.rb
index 51db01c232..74c8093f98 100644
--- a/lib/chef/http/ssl_policies.rb
+++ b/lib/chef/http/ssl_policies.rb
@@ -77,7 +77,7 @@ class Chef
http_client.cert_store.set_default_paths
end
if config.trusted_certs_dir
- certs = Dir.glob(File.join(Chef::Util::PathHelper.escape_glob(config.trusted_certs_dir), "*.{crt,pem}"))
+ certs = Dir.glob(File.join(Chef::Util::PathHelper.escape_glob_dir(config.trusted_certs_dir), "*.{crt,pem}"))
certs.each do |cert_file|
cert = OpenSSL::X509::Certificate.new(File.read(cert_file))
add_trusted_cert(cert)