diff options
| author | James Turnbull <james@lovedthanlost.net> | 2008-10-02 07:40:58 +1000 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2008-10-02 07:40:58 +1000 |
| commit | 93f952a210ff6099c04f8c0157d79e338b901df5 (patch) | |
| tree | c40d4412eaa2ca8e50c8eee4f6e62203fec86688 | |
| parent | 862077513570c996e9124743369c9af92485151f (diff) | |
| download | puppet-93f952a210ff6099c04f8c0157d79e338b901df5.tar.gz puppet-93f952a210ff6099c04f8c0157d79e338b901df5.tar.xz puppet-93f952a210ff6099c04f8c0157d79e338b901df5.zip | |
Fixed #1586 - Specifying "fully qualified" package names in Gentoo
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | lib/puppet/provider/package/portage.rb | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -1,4 +1,6 @@ 0.24.x + Fixed #1586 - Specifying "fully qualified" package names in Gentoo + Fixed #1620 - Add 'sles' to Puppet confines when 'suse' is used Fixed #1585 - Allow complex 'if' and variable expressions diff --git a/lib/puppet/provider/package/portage.rb b/lib/puppet/provider/package/portage.rb index b382d80da..ae7194f89 100644 --- a/lib/puppet/provider/package/portage.rb +++ b/lib/puppet/provider/package/portage.rb @@ -72,7 +72,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa result_format = /(\S+) (\S+) \[(?:([0-9.a-zA-Z]+(?:_(?:alpha|beta|pre|rc|p)[0-9]*)*(?:-r[0-9]*)?)(?:\([^\)]+\))?(?:\[([^\]]+)\])?[ ]*)*\] \[(?:(?:\{M\})?(?:\([~*]+\))?([0-9.a-zA-Z]+(?:_(?:alpha|beta|pre|rc|p)[0-9]*)*(?:-r[0-9]*)?)(?:\(([^\)]+)\))?(?:![mf])*(?:\[([^\]]+)\])?)?\] ([\S]*) (.*)/ result_fields = [:category, :name, :ensure, :ensure_overlay, :version_available, :slot, :overlay, :vendor, :description] - search_field = @resource[:category] ? "--category-name" : "--name" + search_field = package_name.count('/') > 0 ? "--category-name" : "--name" search_value = package_name search_format = "<category> <name> [<installedversionsshort>] [<best>] <homepage> <description>" |