diff options
| author | The Bundler Bot <bot@bundler.io> | 2018-03-05 01:59:08 +0000 |
|---|---|---|
| committer | Colby Swandale <me@colby.fyi> | 2018-04-20 10:27:32 +1000 |
| commit | aa133da3e7e151bb3b10644adc3639e0b8a514d4 (patch) | |
| tree | 5ee9bb0f2ffc123f10a28a18498655ffd11b4bcd | |
| parent | f10ad1a4c15dbec61c6403a9b36e8d4e90c98b1d (diff) | |
| download | bundler-aa133da3e7e151bb3b10644adc3639e0b8a514d4.tar.gz | |
Auto merge of #6323 - MSP-Greg:fix_fbb1ff7_pr6237, r=hsbt
Fix source_location call in PR 6237 and commit fbb1ff7
Thanks to @nobu for pointing out the error (which was mine). `source_location` returns an array, not a string.
(cherry picked from commit ffe58a33ecf36997d071b980e87239ccf5365421)
| -rw-r--r-- | lib/bundler/rubygems_integration.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bundler/rubygems_integration.rb b/lib/bundler/rubygems_integration.rb index 231b085f05..57abeda088 100644 --- a/lib/bundler/rubygems_integration.rb +++ b/lib/bundler/rubygems_integration.rb @@ -571,7 +571,7 @@ module Bundler redefine_method(klass, sym, method) end if Binding.public_method_defined?(:source_location) - post_reset_hooks.reject! {|proc| proc.binding.source_location == __FILE__ } + post_reset_hooks.reject! {|proc| proc.binding.source_location[0] == __FILE__ } else post_reset_hooks.reject! {|proc| proc.binding.eval("__FILE__") == __FILE__ } end |