ben/puppet-sabayon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'entropy-tags'

Browse Source
This commit is contained in:
Ben Roberts
2011-06-12 19:03:37 +01:00
parent 98bf0e8ca0 8c2c72af58
commit ed5d98df92
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/puppet/provider/package/entropy.rb
View File

@@ -16,8 +16,8 @@ Puppet::Type.type(:package).provide :entropy, :parent => Puppet::Provider::Packa
defaultfor :operatingsystem => :sabayon defaultfor :operatingsystem => :sabayon
def self.instances def self.instances
result_format = /^(\S+)\/(\S+)-([\.\d]+(?:_(?:alpha|beta|pre|rc|p)\d+)?(?:-r\d+)?)$/ result_format = /^(\S+)\/(\S+)-([\.\d]+(?:_(?:alpha|beta|pre|rc|p)\d+)?(?:-r\d+)?)(?:#(\S+))?$/
result_fields = [:category, :name, :version_available] result_fields = [:category, :name, :ensure]
begin begin
search_output = equo "query", "installed", "--nocolor", "--quiet" search_output = equo "query", "installed", "--nocolor", "--quiet"
@@ -66,7 +66,7 @@ Puppet::Type.type(:package).provide :entropy, :parent => Puppet::Provider::Packa
end end
def query def query
result_format = /^(\S+)\/(\S+)-([\.\d]+(?:_(?:alpha|beta|pre|rc|p)\d+)?(?:-r\d+)?)$/ result_format = /^(\S+)\/(\S+)-([\.\d]+(?:_(?:alpha|beta|pre|rc|p)\d+)?(?:-r\d+)?)(?:#(\S+))?$/
result_fields = [:category, :name, :version_available] result_fields = [:category, :name, :version_available]
begin begin
@@ -76,16 +76,16 @@ Puppet::Type.type(:package).provide :entropy, :parent => Puppet::Provider::Packa
search_match = search_output.match(result_format) search_match = search_output.match(result_format)
if search_match if search_match
package = {} package = {}
search_match.captures.each do |field, value| result_fields.zip(search_match.captures).each do |field, value|
package[field] = value unless !value or value.empty? package[field] = value unless !value or value.empty?
end end
installed_output = equo 'match', '--quiet', '--installed', package_name installed_output = equo 'match', '--quiet', '--installed', package_name
installed_output.chomp installed_output.chomp
installed_match = installed_output.match(result_format) installed_match = installed_output.match(result_format)
installed_match_fields = Hash[result_fields.zip(installed_match.captures)]
if installed_match if installed_match
installed_match_fields = Hash[result_fields.zip(installed_match.captures)]
package[:ensure] = installed_match_fields[:version_available] package[:ensure] = installed_match_fields[:version_available]
else else
package[:ensure] = :absent package[:ensure] = :absent