From 882df7423d0f4dab5d03e2ebee6c7ff91b01cfb3 Mon Sep 17 00:00:00 2001 From: Ben Roberts Date: Sun, 14 Oct 2018 11:53:55 +0100 Subject: [PATCH] Handle packages with pre_pre version strings --- lib/puppet/provider/package/entropy.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/puppet/provider/package/entropy.rb b/lib/puppet/provider/package/entropy.rb index f860ee4..8989b24 100644 --- a/lib/puppet/provider/package/entropy.rb +++ b/lib/puppet/provider/package/entropy.rb @@ -25,7 +25,7 @@ Puppet::Type.type(:package).provide(:entropy, :parent => Puppet::Provider::Packa defaultfor :operatingsystem => :Sabayon def self.instances - result_format = /^(\S+)\/(\S+)-([\.\d]+(?:_?(?:a(?:lpha)?|b(?:eta)?|pre|rc|p)\d*)?(?:-r\d+)?)(?:#(\S+))?$/ + result_format = /^(\S+)\/(\S+)-([\.\d]+(?:_?(?:a(?:lpha)?|b(?:eta)?|pre|pre_pre|rc|p)\d*)?(?:-r\d+)?)(?:#(\S+))?$/ result_fields = [:category, :name, :ensure] begin @@ -88,7 +88,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+)?)(?::[^#]+)?(?:#(\S+))?$/ + result_format = /^(\S+)\/(\S+)-([\.\d]+(?:_(?:alpha|beta|pre_pre|pre|rc|p)\d+)?(?:-r\d+)?)(?::[^#]+)?(?:#(\S+))?$/ result_fields = [:category, :name, :version_available] begin