From 11aa4bcb505daf191f9a794eeacba46b78ef9363 Mon Sep 17 00:00:00 2001 From: Ben Roberts Date: Mon, 10 Oct 2016 21:43:30 +0100 Subject: [PATCH] Minor fixups to entropy_mask provider --- lib/puppet/provider/entropy_mask/parsed.rb | 2 -- lib/puppet/type/entropy_mask.rb | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/puppet/provider/entropy_mask/parsed.rb b/lib/puppet/provider/entropy_mask/parsed.rb index 948417c..74334de 100644 --- a/lib/puppet/provider/entropy_mask/parsed.rb +++ b/lib/puppet/provider/entropy_mask/parsed.rb @@ -11,8 +11,6 @@ Puppet::Type.type(:entropy_mask).provide(:parsed, defaultfor :operatingsystem => :sabayon - commands({:equo => "equo"}) - text_line :blank, :match => /^\s*$/ diff --git a/lib/puppet/type/entropy_mask.rb b/lib/puppet/type/entropy_mask.rb index 7d2f5bc..5cad95f 100644 --- a/lib/puppet/type/entropy_mask.rb +++ b/lib/puppet/type/entropy_mask.rb @@ -12,14 +12,14 @@ Puppet::Type.newtype(:entropy_mask) do end newproperty(:package) do - desc "Name of hte package being masked" + desc "Name of the package being masked" end newproperty(:version) do desc "Version of the package" validate do |value| - raise(ArgumentError, "") if value !~ /^([<>]=?|=)?(\d*(?:\.\d+[a-zA-Z]*)*)(?:_((?:alpha|beta|pre|rc)\d*))?/ + raise(ArgumentError, "") if value !~ /^(\d*(?:\.\d+[a-zA-Z]*)*)(?:_((?:alpha|beta|pre|rc)\d*))?(-r\d+)?$/ end end