diff options
| author | The Bundler Bot <bot@bundler.io> | 2018-01-16 02:42:30 +0000 |
|---|---|---|
| committer | Colby Swandale <me@colby.fyi> | 2018-04-20 10:26:13 +1000 |
| commit | 5d463bb5368772337351d6e1fa3eca8f7c98faf6 (patch) | |
| tree | 6427cbb56c8dc16eb46fbf76ba433edc95c52297 | |
| parent | 4f7a4358f72c592614c645d4f86715ca5c992a15 (diff) | |
| download | bundler-5d463bb5368772337351d6e1fa3eca8f7c98faf6.tar.gz | |
Auto merge of #6254 - bundler:seg-friendly-error-fallback, r=segiddins
[FriendlyErrors] Fallback to the original error if the friendly message raises
### What was the end-user problem that led to this PR?
This would have made diagnosing https://github.com/bundler/bundler/issues/6220 much easier
### What was your diagnosis of the problem?
My diagnosis was we do a lot in our error handler, so it needs a fallback
### What is your fix for the problem, implemented in this PR?
My fix falls back to just re-raising the original error
(cherry picked from commit d2ff01867b5d4fcbbf6e6dae1ddcc155392909a3)
| -rw-r--r-- | lib/bundler/friendly_errors.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/bundler/friendly_errors.rb b/lib/bundler/friendly_errors.rb index f624185773..ae3299a7c8 100644 --- a/lib/bundler/friendly_errors.rb +++ b/lib/bundler/friendly_errors.rb @@ -45,6 +45,8 @@ module Bundler "Alternatively, you can increase the amount of memory the JVM is able to use by running Bundler with jruby -J-Xmx1024m -S bundle (JRuby defaults to 500MB)." else request_issue_report_for(error) end + rescue + raise error end def exit_status(error) |