diff options
author | David Lutterkort <lutter@redhat.com> | 2009-06-01 13:04:04 -0700 |
---|---|---|
committer | James Turnbull <james@lovedthanlost.net> | 2009-06-03 23:34:54 +1000 |
commit | 9735c5055cbb267e740838cd50b2205b87fffe57 (patch) | |
tree | a27e047b22c3ab3408515fd42389e9c04b5c36b1 /lib/puppet | |
parent | dbfa61b5dcfa42f9fe12ad0d173f9195732d1bc3 (diff) | |
download | puppet-9735c5055cbb267e740838cd50b2205b87fffe57.tar.gz puppet-9735c5055cbb267e740838cd50b2205b87fffe57.tar.xz puppet-9735c5055cbb267e740838cd50b2205b87fffe57.zip |
* provider/augeas: match comparison uses '==' and '!=' again
Change the syntax for match in an onlyif back to using '==' for equality
comparison instead of 'eq' (this was the behavior before 9a2642) and make
operator for inequality '!='.
Diffstat (limited to 'lib/puppet')
-rw-r--r-- | lib/puppet/provider/augeas/augeas.rb | 10 | ||||
-rw-r--r-- | lib/puppet/type/augeas.rb | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/puppet/provider/augeas/augeas.rb b/lib/puppet/provider/augeas/augeas.rb index 8e5d63030..de52c1292 100644 --- a/lib/puppet/provider/augeas/augeas.rb +++ b/lib/puppet/provider/augeas/augeas.rb @@ -39,8 +39,8 @@ Puppet::Type.type(:augeas).provide(:augeas) do "match" => [ :path, :glob ], "size" => [:comparator, :int], "include" => [:string], - "eq" => [:glob], - "noteq" => [:glob] + "==" => [:glob], + "!=" => [:glob] } COMMANDS["ins"] = COMMANDS["insert"] @@ -68,7 +68,7 @@ Puppet::Type.type(:augeas).provide(:augeas) do data.each do |line| argline = [] sc = StringScanner.new(line) - cmd = sc.scan(/\w+/) + cmd = sc.scan(/\w+|==|!=/) formals = COMMANDS[cmd] fail("Unknown command #{cmd}") unless formals argline << cmd @@ -203,7 +203,7 @@ Puppet::Type.type(:augeas).provide(:augeas) do when "include" arg = clause_array.shift return_value = result.include?(arg) - when "eq" + when "==" begin arg = clause_array.shift new_array = eval arg @@ -211,7 +211,7 @@ Puppet::Type.type(:augeas).provide(:augeas) do rescue fail("Invalid array in command: #{cmd_array.join(" ")}") end - when "noteq" + when "!=" begin arg = clause_array.shift new_array = eval arg diff --git a/lib/puppet/type/augeas.rb b/lib/puppet/type/augeas.rb index c4ed88df5..4ae3f06e1 100644 --- a/lib/puppet/type/augeas.rb +++ b/lib/puppet/type/augeas.rb @@ -71,8 +71,8 @@ Puppet::Type.newtype(:augeas) do get [AUGEAS_PATH] [COMPARATOR] [STRING] match [MATCH_PATH] size [COMPARATOR] [INT] match [MATCH_PATH] include [STRING] - match [MATCH_PATH] eq [AN_ARRAY] - match [MATCH_PATH] noteq [AN_ARRAY] + match [MATCH_PATH] == [AN_ARRAY] + match [MATCH_PATH] != [AN_ARRAY] where:: |