summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Bundler Bot <bot@bundler.io>2018-03-05 01:59:08 +0000
committerThe Bundler Bot <bot@bundler.io>2018-03-05 01:59:08 +0000
commitffe58a33ecf36997d071b980e87239ccf5365421 (patch)
tree065e973b243e366e5321696a179ac7f1f884c322
parent56a49bb2fe82c1887320b965338618fcc74a16e7 (diff)
parentf9f61d6302b8ebe657092c09c587731a64b7fa50 (diff)
downloadbundler-ffe58a33ecf36997d071b980e87239ccf5365421.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.
-rw-r--r--lib/bundler/rubygems_integration.rb2
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