From c2ee8a6ca5de9f288e4ab3b98f68ef4cf6ad1638 Mon Sep 17 00:00:00 2001 From: Ben Roberts Date: Tue, 11 Oct 2016 20:22:49 +0100 Subject: [PATCH] Entropy wants ## for inline comments --- lib/puppet/provider/entropy_mask/parsed.rb | 4 ++-- lib/puppet/provider/entropy_splitdebug/parsed.rb | 4 ++-- lib/puppet/provider/entropy_splitdebug_mask/parsed.rb | 4 ++-- lib/puppet/provider/entropy_unmask/parsed.rb | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/puppet/provider/entropy_mask/parsed.rb b/lib/puppet/provider/entropy_mask/parsed.rb index 74334de..49f6590 100644 --- a/lib/puppet/provider/entropy_mask/parsed.rb +++ b/lib/puppet/provider/entropy_mask/parsed.rb @@ -22,7 +22,7 @@ Puppet::Type.type(:entropy_mask).provide(:parsed, record_line :parsed, :fields => %w{operator package version slot use tag repo name}, - :match => %r{^([<>]?=)?([a-zA-Z+\/-]*)(?:-(\d+(?:\.\d+)*[a-z]*(?:_(?:alpha|beta|pre|p|rc)\d*)?(?:-r\d+)?))?(?::(\w+))?(?:\[([^\]]*)\])?(?:#(\w+))?(?:::(\w+))?\s+# Puppet Name: (.*)\s*$}, + :match => %r{^([<>]?=)?([a-zA-Z+\/-]*)(?:-(\d+(?:\.\d+)*[a-z]*(?:_(?:alpha|beta|pre|p|rc)\d*)?(?:-r\d+)?))?(?::(\w+))?(?:\[([^\]]*)\])?(?:#(\w+))?(?:::(\w+))?\s+#+ Puppet Name: (.*)\s*$}, :block_eval => :instance do def to_line(record) @@ -34,7 +34,7 @@ Puppet::Type.type(:entropy_mask).provide(:parsed, line += "[" + record[:use] + "]" if record[:use] line += "#" + record[:tag] if record[:tag] line += "::" + record[:repo] if record[:repo] - line += " # Puppet Name: " + record[:name] + line += " ## Puppet Name: " + record[:name] line end diff --git a/lib/puppet/provider/entropy_splitdebug/parsed.rb b/lib/puppet/provider/entropy_splitdebug/parsed.rb index 7bf34b5..1e9925b 100644 --- a/lib/puppet/provider/entropy_splitdebug/parsed.rb +++ b/lib/puppet/provider/entropy_splitdebug/parsed.rb @@ -22,7 +22,7 @@ Puppet::Type.type(:entropy_splitdebug).provide(:parsed, record_line :parsed, :fields => %w{operator package version slot use tag repo name}, - :match => %r{^([<>]?=)?([a-zA-Z+\/-]*)(?:-(\d+(?:\.\d+)*[a-z]*(?:_(?:alpha|beta|pre|p|rc)\d*)?(?:-r\d+)?))?(?::(\w+))?(?:\[([^\]]*)\])?(?:#(\w+))?(?:::(\w+))?\s+# Puppet Name: (.*)\s*$}, + :match => %r{^([<>]?=)?([a-zA-Z+\/-]*)(?:-(\d+(?:\.\d+)*[a-z]*(?:_(?:alpha|beta|pre|p|rc)\d*)?(?:-r\d+)?))?(?::(\w+))?(?:\[([^\]]*)\])?(?:#(\w+))?(?:::(\w+))?\s+#+ Puppet Name: (.*)\s*$}, :block_eval => :instance do def to_line(record) @@ -34,7 +34,7 @@ Puppet::Type.type(:entropy_splitdebug).provide(:parsed, line += "[" + record[:use] + "]" if record[:use] line += "#" + record[:tag] if record[:tag] line += "::" + record[:repo] if record[:repo] - line += " # Puppet Name: " + record[:name] + line += " ## Puppet Name: " + record[:name] line end diff --git a/lib/puppet/provider/entropy_splitdebug_mask/parsed.rb b/lib/puppet/provider/entropy_splitdebug_mask/parsed.rb index 31b0b4c..f6f99d3 100644 --- a/lib/puppet/provider/entropy_splitdebug_mask/parsed.rb +++ b/lib/puppet/provider/entropy_splitdebug_mask/parsed.rb @@ -22,7 +22,7 @@ Puppet::Type.type(:entropy_splitdebug).provide(:parsed, record_line :parsed, :fields => %w{operator package version slot use tag repo name}, - :match => %r{^([<>]?=)?([a-zA-Z+\/-]*)(?:-(\d+(?:\.\d+)*[a-z]*(?:_(?:alpha|beta|pre|p|rc)\d*)?(?:-r\d+)?))?(?::(\w+))?(?:\[([^\]]*)\])?(?:#(\w+))?(?:::(\w+))?\s+# Puppet Name: (.*)\s*$}, + :match => %r{^([<>]?=)?([a-zA-Z+\/-]*)(?:-(\d+(?:\.\d+)*[a-z]*(?:_(?:alpha|beta|pre|p|rc)\d*)?(?:-r\d+)?))?(?::(\w+))?(?:\[([^\]]*)\])?(?:#(\w+))?(?:::(\w+))?\s+#+ Puppet Name: (.*)\s*$}, :block_eval => :instance do def to_line(record) @@ -34,7 +34,7 @@ Puppet::Type.type(:entropy_splitdebug).provide(:parsed, line += "[" + record[:use] + "]" if record[:use] line += "#" + record[:tag] if record[:tag] line += "::" + record[:repo] if record[:repo] - line += " # Puppet Name: " + record[:name] + line += " ## Puppet Name: " + record[:name] line end diff --git a/lib/puppet/provider/entropy_unmask/parsed.rb b/lib/puppet/provider/entropy_unmask/parsed.rb index dbbd4fc..d9e5419 100644 --- a/lib/puppet/provider/entropy_unmask/parsed.rb +++ b/lib/puppet/provider/entropy_unmask/parsed.rb @@ -22,7 +22,7 @@ Puppet::Type.type(:entropy_unmask).provide(:parsed, record_line :parsed, :fields => %w{operator package version slot use tag repo name}, - :match => %r{^([<>]?=)?([a-zA-Z+\/-]*)(?:-(\d+(?:\.\d+)*[a-z]*(?:_(?:alpha|beta|pre|p|rc)\d*)?(?:-r\d+)?))?(?::(\w+))?(?:\[([^\]]*)\])?(?:#(\w+))?(?:::(\w+))?\s+# Puppet Name: (.*)\s*$}, + :match => %r{^([<>]?=)?([a-zA-Z+\/-]*)(?:-(\d+(?:\.\d+)*[a-z]*(?:_(?:alpha|beta|pre|p|rc)\d*)?(?:-r\d+)?))?(?::(\w+))?(?:\[([^\]]*)\])?(?:#(\w+))?(?:::(\w+))?\s+#+ Puppet Name: (.*)\s*$}, :block_eval => :instance do def to_line(record) @@ -34,7 +34,7 @@ Puppet::Type.type(:entropy_unmask).provide(:parsed, line += "[" + record[:use] + "]" if record[:use] line += "#" + record[:tag] if record[:tag] line += "::" + record[:repo] if record[:repo] - line += " # Puppet Name: " + record[:name] + line += " ## Puppet Name: " + record[:name] line end