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/role.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/role.rb')
| -rw-r--r-- | lib/chef/role.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/role.rb b/lib/chef/role.rb index ed22bc87e4..9b6fa1c59d 100644 --- a/lib/chef/role.rb +++ b/lib/chef/role.rb @@ -253,7 +253,7 @@ class Chef def self.from_disk(name) paths = Array(Chef::Config[:role_path]) paths.each do |path| - roles_files = Dir.glob(File.join(Chef::Util::PathHelper.escape_glob(path), "**", "**")) + roles_files = Dir.glob(File.join(Chef::Util::PathHelper.escape_glob_dir(path), "**", "**")) js_files = roles_files.select { |file| file.match(/\/#{name}\.json$/) } rb_files = roles_files.select { |file| file.match(/\/#{name}\.rb$/) } if js_files.count > 1 or rb_files.count > 1 |