diff options
| author | Bryan Kearney <bkearney@redhat.com> | 2010-03-17 08:56:36 -0400 |
|---|---|---|
| committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
| commit | dfb80825b1494601022dfd711f1266f884e721aa (patch) | |
| tree | b2eb1ffa9aaca609d98e38050f1dc1101a42faad | |
| parent | 6e16ea17413b46a149972da4690a0d6d7f7d7013 (diff) | |
| download | puppet-dfb80825b1494601022dfd711f1266f884e721aa.tar.gz puppet-dfb80825b1494601022dfd711f1266f884e721aa.tar.xz puppet-dfb80825b1494601022dfd711f1266f884e721aa.zip | |
Fixed the return types were valid, and removed the copy paste error with the exception logic
| -rw-r--r-- | lib/puppet/provider/augeas/augeas.rb | 8 | ||||
| -rw-r--r-- | spec/unit/provider/augeas/augeas.rb | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/puppet/provider/augeas/augeas.rb b/lib/puppet/provider/augeas/augeas.rb index 7a7d55de1..0f1503a2f 100644 --- a/lib/puppet/provider/augeas/augeas.rb +++ b/lib/puppet/provider/augeas/augeas.rb @@ -331,15 +331,15 @@ Puppet::Type.type(:augeas).provide(:augeas) do when "set" debug("sending command '#{command}' with params #{cmd_array.inspect}") rv = aug.set(cmd_array[0], cmd_array[1]) - fail("Error sending command '#{command}' with params #{cmd_array.inspect}/#{e.message}") if (rv) + fail("Error sending command '#{command}' with params #{cmd_array.inspect}") if (!rv) when "rm", "remove" debug("sending command '#{command}' with params #{cmd_array.inspect}") rv = aug.rm(cmd_array[0]) - fail("Error sending command '#{command}' with params #{cmd_array.inspect}/#{e.message}") if (rv) + fail("Error sending command '#{command}' with params #{cmd_array.inspect}") if (rv == -1) when "clear" debug("sending command '#{command}' with params #{cmd_array.inspect}") rv = aug.clear(cmd_array[0]) - fail("Error sending command '#{command}' with params #{cmd_array.inspect}/#{e.message}") if (rv == -1) + fail("Error sending command '#{command}' with params #{cmd_array.inspect}") if (!rv) when "insert", "ins" label = cmd_array[0] where = cmd_array[1] @@ -351,7 +351,7 @@ Puppet::Type.type(:augeas).provide(:augeas) do end debug("sending command '#{command}' with params #{[label, where, path].inspect}") rv = aug.insert(path, label, before) - fail("Error sending command '#{command}' with params #{cmd_array.inspect}/#{e.message}") if (rv == -1) + fail("Error sending command '#{command}' with params #{cmd_array.inspect}") if (rv == -1) else fail("Command '#{command}' is not supported") end rescue SystemExit,NoMemoryError diff --git a/spec/unit/provider/augeas/augeas.rb b/spec/unit/provider/augeas/augeas.rb index 89d3f503b..067126cbd 100644 --- a/spec/unit/provider/augeas/augeas.rb +++ b/spec/unit/provider/augeas/augeas.rb @@ -318,7 +318,7 @@ describe provider_class do command = "set JarJar Binks" context = "/some/path/" @resource.expects(:[]).times(2).returns(command).then.returns(context) - @augeas.expects(:set).with("/some/path/JarJar", "Binks") + @augeas.expects(:set).with("/some/path/JarJar", "Binks").returns(true) @augeas.expects(:save).returns(true) @augeas.expects(:close) @provider.execute_changes.should == :executed @@ -348,7 +348,7 @@ describe provider_class do command = "clear Jar/Jar" context = "/foo/" @resource.expects(:[]).times(2).returns(command).then.returns(context) - @augeas.expects(:clear).with("/foo/Jar/Jar") + @augeas.expects(:clear).with("/foo/Jar/Jar").returns(true) @augeas.expects(:save).returns(true) @augeas.expects(:close) @provider.execute_changes.should == :executed @@ -390,7 +390,7 @@ describe provider_class do context = "/foo/" @resource.expects(:[]).times(2).returns(command).then.returns(context) @augeas.expects(:insert).with("/Jar/Jar", "Binks", false) - @augeas.expects(:clear).with("/foo/Jar/Jar") + @augeas.expects(:clear).with("/foo/Jar/Jar").returns(true) @augeas.expects(:save).returns(true) @augeas.expects(:close) @provider.execute_changes.should == :executed |