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

Improve parsing of portage package versions

Browse Source
This commit is contained in:
Ben Roberts
2019-12-08 18:20:27 +00:00
parent b535146112
commit 75751b60b3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,7 @@ Puppet::Type.type(:package).provide(:entropy, parent: Puppet::Provider::Package)
def self.instances def self.instances
result_format = %r{ 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+))?$ (?:-r\d+)?)(?:\#(\S+))?$
}x }x
result_fields = [:category, :name, :ensure] result_fields = [:category, :name, :ensure]
@@ -87,7 +87,7 @@ Puppet::Type.type(:package).provide(:entropy, parent: Puppet::Provider::Package)
def query def query
result_format = %r{ 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+))?$ (?::[^\#]+)?(?:\#(\S+))?$
}x }x
result_fields = [:category, :name, :version_available] result_fields = [:category, :name, :version_available]