diff options
| author | Claire McQuin <claire@getchef.com> | 2014-09-19 12:08:34 -0700 |
|---|---|---|
| committer | Claire McQuin <claire@getchef.com> | 2014-09-22 11:22:30 -0700 |
| commit | 3ad6c2827875153962ac92496be99d42c8d5baf7 (patch) | |
| tree | 258f22150eed1934e7480f1e7f880a9ace49ed49 | |
| parent | 4c0fd01eafb5eb87aa56b37b8ea059193df4d26c (diff) | |
| download | chef-3ad6c2827875153962ac92496be99d42c8d5baf7.tar.gz | |
Escape path for globbing.
| -rw-r--r-- | lib/chef/provider/package/portage.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/chef/provider/package/portage.rb b/lib/chef/provider/package/portage.rb index 7e0eebd0d9..831ef0ec2f 100644 --- a/lib/chef/provider/package/portage.rb +++ b/lib/chef/provider/package/portage.rb @@ -34,7 +34,9 @@ class Chef category, pkg = %r{^#{PACKAGE_NAME_PATTERN}$}.match(@new_resource.package_name)[1,2] - possibilities = Dir["/var/db/pkg/#{category || "*"}/#{pkg}-*"].map {|d| d.sub(%r{/var/db/pkg/}, "") } + globsafe_category = category ? Chef::Util::PathHelper.escape_glob(category) : nil + globsafe_pkg = Chef::Util::PathHelper.escape_glob(pkg) + possibilities = Dir["/var/db/pkg/#{globsafe_category || "*"}/#{globsafe_pkg}-*"].map {|d| d.sub(%r{/var/db/pkg/}, "") } versions = possibilities.map do |entry| if(entry =~ %r{[^/]+/#{Regexp.escape(pkg)}\-(\d[\.\d]*((_(alpha|beta|pre|rc|p)\d*)*)?(-r\d+)?)}) [$&, $1] |