From 75751b60b3a3e41d0112432e03d9197b58915ebc Mon Sep 17 00:00:00 2001 From: Ben Roberts Date: Sun, 8 Dec 2019 18:20:27 +0000 Subject: [PATCH] Improve parsing of portage package versions --- 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 a5e7a0e..4f27cf1 100644 --- a/lib/puppet/provider/package/entropy.rb +++ b/lib/puppet/provider/package/entropy.rb @@ -24,7 +24,7 @@ Puppet::Type.type(:package).provide(:entropy, parent: Puppet::Provider::Package) def self.instances result_format = %r{ - ^(\S+)\/(\S+)-([\.\d]+(?:_?(?:a(?:lpha)?|b(?:eta)?|pre|pre_pre|rc|p)\d*)? + ^(\S+)\/(\S+)-([\.\d]+[a-z]?(?:_(?:alpha|beta|pre|pre_pre|rc|p)\d*)? (?:-r\d+)?)(?:\#(\S+))?$ }x result_fields = [:category, :name, :ensure] @@ -87,7 +87,7 @@ Puppet::Type.type(:package).provide(:entropy, parent: Puppet::Provider::Package) def query result_format = %r{ - ^(\S+)\/(\S+)-([\.\d]+(?:_(?:alpha|beta|pre_pre|pre|rc|p)\d+)?(?:-r\d+)?) + ^(\S+)\/(\S+)-([\.\d]+[a-z]?(?:_(?:alpha|beta|pre_pre|pre|rc|p)\d*)?(?:-r\d+)?) (?::[^\#]+)?(?:\#(\S+))?$ }x result_fields = [:category, :name, :version_available]