Fix for #3088 (catching Exception also traps SystemExit)

Changing rescues from the default to Exception (to catch errors that don't
descend from StandardError) had the unintended consequence of catching (and
suppressing) SystemExit.

This patch restores the behavior of by reraising the exception.

Of the other exceptions that fall through the same crack (NoMemoryError,
SignalException, LoadError, Interrupt, NotImplementedError, and ScriptError)
this patch also reraises NoMemoryError, SignalException, and Interrupt in the
same way and leaves the rest captured.

1 files changed, 4 insertions, 0 deletions

diff --git a/lib/puppet/provider/augeas/augeas.rb b/lib/puppet/provider/augeas/augeas.rb
index a645fbe8a..748c84e7d 100644
--- a/lib/puppet/provider/augeas/augeas.rb
+++ b/lib/puppet/provider/augeas/augeas.rb
@@ -254,6 +254,8 @@ Puppet::Type.type(:augeas).provide(:augeas) do
                     when "get"; return_value = process_get(cmd_array)
                     when "match"; return_value = process_match(cmd_array)
                     end
+                rescue SystemExit,NoMemoryError,SignalException,Interrupt
+                    raise
                 rescue Exception => e
                     fail("Error sending command '#{command}' with params #{cmd_array[1..-1].inspect}/#{e.message}")
                 end
@@ -335,6 +337,8 @@ Puppet::Type.type(:augeas).provide(:augeas) do
                         aug.insert(path, label, before)
                     else fail("Command '#{command}' is not supported")
                 end
+            rescue SystemExit,NoMemoryError,SignalException,Interrupt
+                raise
             rescue Exception => e
                 fail("Error sending command '#{command}' with params #{cmd_array.inspect}/#{e.message}")
             end