diff options
| author | James Turnbull <james@lovedthanlost.net> | 2010-04-30 18:03:02 +1000 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2010-04-30 18:03:02 +1000 |
| commit | 8a3049591a2913c7a7a33407f742892bf27a2d34 (patch) | |
| tree | 3bc08d52a2c55288f31446da6d210b3995c3a12f /lib | |
| parent | e4130af8b035fc8f62561c01a092327d96d12658 (diff) | |
| download | puppet-8a3049591a2913c7a7a33407f742892bf27a2d34.tar.gz puppet-8a3049591a2913c7a7a33407f742892bf27a2d34.tar.xz puppet-8a3049591a2913c7a7a33407f742892bf27a2d34.zip | |
Fixed #3655 - Puppet doesn't find installed packages with portage provider
Thanks to Benedikt Böhm for the patch
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/provider/package/portage.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/provider/package/portage.rb b/lib/puppet/provider/package/portage.rb index 07112cbf0..302ca13a5 100644 --- a/lib/puppet/provider/package/portage.rb +++ b/lib/puppet/provider/package/portage.rb @@ -12,7 +12,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa defaultfor :operatingsystem => :gentoo def self.instances - result_format = /(\S+) (\S+) \[(\S+)\] \[(\S+)\] (\S+) (.*)/ + result_format = /^(\S+)\s+(\S+)\s+\[(\S+)\]\s+\[(\S+)\]\s+(\S+)\s+(.*)$/ result_fields = [:category, :name, :ensure, :version_available, :vendor, :description] version_format = "{last}<version>{}" @@ -72,7 +72,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa end def query - result_format = /(\S+) (\S+) \[(\S*)\] \[(\S+)\] +(\S+) (.*)/ + result_format = /^(\S+)\s+(\S+)\s+\[(\S*)\]\s+\[(\S+)\]\s+(\S+)\s+(.*)$/ result_fields = [:category, :name, :ensure, :version_available, :vendor, :description] version_format = "{last}<version>{}" |