diff options
| author | Luke Kanies <luke@madstop.com> | 2007-12-11 00:29:29 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-12-11 00:29:29 -0600 |
| commit | 4ee5ab81441bc8960ceab8080a04761c8f0fe036 (patch) | |
| tree | 5b0a912bab6f4bc5e805699479c17b021bb6f9e3 /lib | |
| parent | ed642ac45842b8717b8f54f2df9f25b3dc6fe684 (diff) | |
| download | puppet-4ee5ab81441bc8960ceab8080a04761c8f0fe036.tar.gz puppet-4ee5ab81441bc8960ceab8080a04761c8f0fe036.tar.xz puppet-4ee5ab81441bc8960ceab8080a04761c8f0fe036.zip | |
Applying patch for portage package support from thansen
in #895.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/provider/package/portage.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/puppet/provider/package/portage.rb b/lib/puppet/provider/package/portage.rb index 6a42444ef..03274a78d 100644 --- a/lib/puppet/provider/package/portage.rb +++ b/lib/puppet/provider/package/portage.rb @@ -10,8 +10,8 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa defaultfor :operatingsystem => :gentoo def self.instances - result_format = /(\S+) (\S+) \[(.*)\] \[[^0-9]*([^\s:]*)(:\S*)?\] ([\S]*) (.*)/ - result_fields = [:category, :name, :ensure, :version_available, :slot, :vendor, :description] + result_format = /(\S+) (\S+) \[([^\[]*)(\[[^\]]*\])?\] \[[^0-9]*([^\s:\[]*)(\[[^\]]*\])?(:\S*)?\] ([\S]*) (.*)/ + result_fields = [:category, :name, :ensure, :ensure_overlay, :version_available, :overlay, :slot, :vendor, :description] search_format = "{installedversionsshort}<category> <name> [<installedversionsshort>] [<best>] <homepage> <description>{}" @@ -67,8 +67,8 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa end def query - result_format = /(\S+) (\S+) \[(.*)\] \[[^0-9]*([^\s:]*)(:\S*)?\] ([\S]*) (.*)/ - result_fields = [:category, :name, :ensure, :version_available, :slot, :vendor, :description] + result_format = /(\S+) (\S+) \[([^\[]*)(\[[^\]]*\])?\] \[[^0-9]*([^\s:\[]*)(\[[^\]]*\])?(:\S*)?\] ([\S]*) (.*)/ + result_fields = [:category, :name, :ensure, :ensure_overlay, :version_available, :overlay, :slot, :vendor, :description] search_field = @resource[:category] ? "--category-name" : "--name" search_value = package_name |