diff options
| author | David Lutterkort <lutter@redhat.com> | 2009-05-30 23:44:14 -0700 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-06-03 23:34:53 +1000 |
| commit | 171669ad3d3d1f0b7f72cd5cb2c36ad97e7d315c (patch) | |
| tree | 8a6cd98e185d80f45707ebc945f60d500b33daa7 | |
| parent | 51cc752a2e6d2e6ec5b826ae9f447ed516020086 (diff) | |
| download | puppet-171669ad3d3d1f0b7f72cd5cb2c36ad97e7d315c.tar.gz puppet-171669ad3d3d1f0b7f72cd5cb2c36ad97e7d315c.tar.xz puppet-171669ad3d3d1f0b7f72cd5cb2c36ad97e7d315c.zip | |
* provider/augeas: simplify evaluation in process_get/match
| -rw-r--r-- | lib/puppet/provider/augeas/augeas.rb | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/lib/puppet/provider/augeas/augeas.rb b/lib/puppet/provider/augeas/augeas.rb index bd3987b9b..77e261609 100644 --- a/lib/puppet/provider/augeas/augeas.rb +++ b/lib/puppet/provider/augeas/augeas.rb @@ -168,16 +168,15 @@ Puppet::Type.type(:augeas).provide(:augeas) do unless result.nil? case comparator when "!=" - return_value = true if !(result == arg) + return_value = (result != arg) when "=~" regex = Regexp.new(arg) - loc = result=~ regex - return_value = true if ! loc.nil? + return_value = (result =~ regex) else - return_value = true if (result.send(comparator, arg)) + return_value = (result.send(comparator, arg)) end end - return_value + return !!return_value end # Used by the need_to_run? method to process match filters. Returns @@ -203,15 +202,15 @@ Puppet::Type.type(:augeas).provide(:augeas) do fail("Invalid command: #{cmd_array.join(" ")}") if clause_array.length != 2 comparator = clause_array.shift arg = clause_array.shift - return_value = true if (result.size.send(comparator, arg)) + return_value = (result.size.send(comparator, arg)) when "include": arg = clause_array.shift - return_value = true if result.include?(arg) + return_value = result.include?(arg) when "eq": begin arg = clause_array.shift new_array = eval arg - return_value = true if result == new_array + return_value = (result == new_array) rescue fail("Invalid array in command: #{cmd_array.join(" ")}") end @@ -219,13 +218,13 @@ Puppet::Type.type(:augeas).provide(:augeas) do begin arg = clause_array.shift new_array = eval arg - return_value = true if result != new_array + return_value = (result != new_array) rescue fail("Invalid array in command: #{cmd_array.join(" ")}") end end end - return_value + return !!return_value end def get_augeas_version |