Skip to content

Commit

Permalink
reduced some code, yo!!
Browse files Browse the repository at this point in the history
  • Loading branch information
Dan Bode committed Mar 17, 2010
1 parent e825530 commit 50853b7
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions lib/puppet/provider/sudoers/parsed.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,16 @@
:post_parse => proc { |hash|
Puppet.debug("sudoers post_parse for line #{hash[:line]}")
# create records for aliases
parsed = Puppet::Type.type(:sudoers).provider(:parsed)
if (hash[:line] =~ /^\s*((User|Runas|Host|Cmnd)_Alias)\s+(\S+)\s*=\s*(.+)$/)
Puppet.debug("parsed line as Alias")
Puppet::Type.type(:sudoers).provider(:parsed).parse_alias($1, $3, $4, hash)
parsed.parse_alias($1, $3, $4, hash)
elsif (hash[:line] =~ /^\s*(Defaults\S*)\s*(.*)$/)
Puppet.debug("parsed line as Defaults")
Puppet::Type.type(:sudoers).provider(:parsed).parse_defaults($1, $2, hash)
parsed.parse_defaults($1, $2, hash)
elsif (hash[:line] =~ /^\s*(.*)?=(.*)$/)
Puppet.debug("parsed line as User Spec")
Puppet::Type.type(:sudoers).provider(:parsed).parse_user_spec($1, $2, hash)
parsed.parse_user_spec($1, $2, hash)
else
raise Puppet::Error, "invalid line #{hash[:line]}"
end
Expand Down Expand Up @@ -131,7 +132,7 @@ def self.prefetch_hook(records)
record[:name] = name
name = nil
else
puts "spec record not created by puppet"
Puppet.info "spec record not created by puppet"
# probably a pre-exting record not created by puppet
end
end
Expand Down

0 comments on commit 50853b7

Please sign in to comment.