Avoid rescue of SignalException in kernel_load and with_friendly_errors

This allows SignalException to be handled gracefully by the ruby interpreter. (rebased on to master with CI Fix, 6084) github: fixes rubygems#6090
dekellum · Oct 14, 2017 · a0c1d73 · a0c1d73
1 parent fea177f
commit a0c1d73
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/lib/bundler/cli/exec.rb b/lib/bundler/cli/exec.rb
@@ -73,7 +73,7 @@ def kernel_load(file, *args)
       signals = Signal.list.keys - RESERVED_SIGNALS
       signals.each {|s| trap(s, "DEFAULT") }
       Kernel.load(file)
-    rescue SystemExit
+    rescue SystemExit, SignalException
       raise
     rescue Exception => e # rubocop:disable Lint/RescueException
       Bundler.ui = ui

diff --git a/lib/bundler/friendly_errors.rb b/lib/bundler/friendly_errors.rb
@@ -120,6 +120,8 @@ def issues_url(exception)
 
   def self.with_friendly_errors
     yield
+  rescue SignalException
+    raise
   rescue Exception => e
     FriendlyErrors.log_error(e)
     exit FriendlyErrors.exit_status(e)