diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-03-10 11:02:23 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2016-03-10 11:02:23 -0800 |
| commit | 6c99e45209183f006d02a96e6fc7908e69836d78 (patch) | |
| tree | 2e7a1aa80dd218a551678d6ac08a11e7503093fb /lib/chef/file_cache.rb | |
| parent | 615f2889ac732ac8435f69f8c9dfdae6f778edb6 (diff) | |
| download | chef-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/file_cache.rb')
| -rw-r--r-- | lib/chef/file_cache.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/file_cache.rb b/lib/chef/file_cache.rb index b4beee4a66..cefc9da1eb 100644 --- a/lib/chef/file_cache.rb +++ b/lib/chef/file_cache.rb @@ -158,9 +158,9 @@ class Chef # [String] - An array of file cache keys matching the glob def find(glob_pattern) keys = Array.new - Dir[File.join(Chef::Util::PathHelper.escape_glob(file_cache_path), glob_pattern)].each do |f| + Dir[File.join(Chef::Util::PathHelper.escape_glob_dir(file_cache_path), glob_pattern)].each do |f| if File.file?(f) - keys << f[/^#{Regexp.escape(Dir[Chef::Util::PathHelper.escape_glob(file_cache_path)].first) + File::Separator}(.+)/, 1] + keys << f[/^#{Regexp.escape(Dir[Chef::Util::PathHelper.escape_glob_dir(file_cache_path)].first) + File::Separator}(.+)/, 1] end end keys |