diff options
| author | Thom May <thom@may.lt> | 2016-05-31 18:13:48 +0100 |
|---|---|---|
| committer | Thom May <thom@may.lt> | 2016-05-31 18:13:48 +0100 |
| commit | f5e9f42b30fc2207ed7b722bf459169c92f0da21 (patch) | |
| tree | 6898a1b0637d279c6f41c01868d30a204dc47f4d /lib/chef | |
| parent | 6354cb4c5e37444c830c6d80eeb3b8f421be8359 (diff) | |
| parent | 183aa233381ea84c98976baadb90bb782a141f75 (diff) | |
| download | chef-f5e9f42b30fc2207ed7b722bf459169c92f0da21.tar.gz | |
Merge pull request #4966 from crigor/ebuild-version-character
Fix portage provider to support version with character
Diffstat (limited to 'lib/chef')
| -rw-r--r-- | lib/chef/provider/package/portage.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/provider/package/portage.rb b/lib/chef/provider/package/portage.rb index 7c52e43bff..52b46b04b4 100644 --- a/lib/chef/provider/package/portage.rb +++ b/lib/chef/provider/package/portage.rb @@ -41,7 +41,7 @@ class Chef globsafe_pkg = Chef::Util::PathHelper.escape_glob_dir(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+)?)} + if entry =~ %r{[^/]+/#{Regexp.escape(pkg)}\-(\d[\.\d]*[a-z]?((_(alpha|beta|pre|rc|p)\d*)*)?(-r\d+)?)} [$&, $1] end end.compact |