From 99bbeb19c6c8ce6631835ab51fb11288509d1cb2 Mon Sep 17 00:00:00 2001 From: Ben Roberts Date: Sun, 12 Jun 2011 12:48:24 +0100 Subject: [PATCH 1/2] Add support for tagged package versions --- lib/puppet/provider/package/entropy.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/puppet/provider/package/entropy.rb b/lib/puppet/provider/package/entropy.rb index 20e330f..1df61f5 100644 --- a/lib/puppet/provider/package/entropy.rb +++ b/lib/puppet/provider/package/entropy.rb @@ -16,7 +16,7 @@ Puppet::Type.type(:package).provide :entropy, :parent => Puppet::Provider::Packa defaultfor :operatingsystem => :sabayon 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] begin @@ -66,7 +66,7 @@ Puppet::Type.type(:package).provide :entropy, :parent => Puppet::Provider::Packa end 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] begin @@ -76,16 +76,16 @@ Puppet::Type.type(:package).provide :entropy, :parent => Puppet::Provider::Packa search_match = search_output.match(result_format) if search_match 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? end installed_output = equo 'match', '--quiet', '--installed', package_name installed_output.chomp installed_match = installed_output.match(result_format) - installed_match_fields = Hash[result_fields.zip(installed_match.captures)] if installed_match + installed_match_fields = Hash[result_fields.zip(installed_match.captures)] package[:ensure] = installed_match_fields[:version_available] else package[:ensure] = :absent From 8c2c72af58d193735c2528dc7f88448389db727c Mon Sep 17 00:00:00 2001 From: Ben Roberts Date: Sun, 12 Jun 2011 18:24:42 +0100 Subject: [PATCH 2/2] Bug fix: installed version of packages not correctly presented to puppet --- lib/puppet/provider/package/entropy.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/puppet/provider/package/entropy.rb b/lib/puppet/provider/package/entropy.rb index 1df61f5..a35ae33 100644 --- a/lib/puppet/provider/package/entropy.rb +++ b/lib/puppet/provider/package/entropy.rb @@ -17,7 +17,7 @@ Puppet::Type.type(:package).provide :entropy, :parent => Puppet::Provider::Packa def self.instances 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 search_output = equo "query", "installed", "--nocolor", "--quiet"