diff options
Diffstat (limited to 'lib/chef/provider/package')
| -rw-r--r-- | lib/chef/provider/package/freebsd/pkg.rb | 3 | ||||
| -rw-r--r-- | lib/chef/provider/package/portage.rb | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/chef/provider/package/freebsd/pkg.rb b/lib/chef/provider/package/freebsd/pkg.rb index c757d26fe5..ebbfbb19b4 100644 --- a/lib/chef/provider/package/freebsd/pkg.rb +++ b/lib/chef/provider/package/freebsd/pkg.rb @@ -20,6 +20,7 @@ # require 'chef/provider/package/freebsd/base' +require 'chef/util/path_helper' class Chef class Provider @@ -87,7 +88,7 @@ class Chef end def file_candidate_version_path - Dir["#{@new_resource.source}/#{@current_resource.package_name}*"][-1].to_s + Dir[Chef::Util::PathHelper.escape_glob("#{@new_resource.source}/#{@current_resource.package_name}") + "*"][-1].to_s end def file_candidate_version diff --git a/lib/chef/provider/package/portage.rb b/lib/chef/provider/package/portage.rb index 7e0eebd0d9..816e262ab0 100644 --- a/lib/chef/provider/package/portage.rb +++ b/lib/chef/provider/package/portage.rb @@ -19,6 +19,7 @@ require 'chef/provider/package' require 'chef/mixin/command' require 'chef/resource/package' +require 'chef/util/path_helper' class Chef class Provider @@ -34,7 +35,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] |