diff options
| -rw-r--r-- | lib/puppet/provider/cron/crontab.rb | 8 | ||||
| -rw-r--r-- | lib/puppet/type/cron.rb | 7 |
2 files changed, 4 insertions, 11 deletions
diff --git a/lib/puppet/provider/cron/crontab.rb b/lib/puppet/provider/cron/crontab.rb index 63a5e67..bbd6442 100644 --- a/lib/puppet/provider/cron/crontab.rb +++ b/lib/puppet/provider/cron/crontab.rb @@ -119,12 +119,8 @@ Puppet::Type.type(:cron).provide(:crontab, parent: Puppet::Provider::ParsedFile, def self.resource_for_record(record, resources) resource = super - if resource - target = resource[:target] || resource[:user] - if record[:target] == target - resource - end - end + target = resource[:target] || resource[:user] if resource + return resource if record[:target] == target end # Return the header placed at the top of each generated file, warning diff --git a/lib/puppet/type/cron.rb b/lib/puppet/type/cron.rb index a811f94..4243bcf 100644 --- a/lib/puppet/type/cron.rb +++ b/lib/puppet/type/cron.rb @@ -188,11 +188,8 @@ Puppet::Type.newtype(:cron) do retval = alphacheck(value, alpha) end - if retval - return retval.to_s - else - self.fail _('%{value} is not a valid %{name}') % { value: value, name: self.class.name } - end + raise _('%{value} is not a valid %{name}') % { value: value, name: self.class.name } unless retval + return retval.to_s if retval end end |