summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwycats <wycats@gmail.com>2010-07-20 22:32:53 -0700
committerwycats <wycats@gmail.com>2010-07-20 22:32:53 -0700
commit5da215b0d0800802b0ecf4f2b7cb6c6a04759dc8 (patch)
tree68e0529789bfb579f029748ac19b70fca27e0441
parent0cd087b4565d720a20b5c5a1bf27c33cef753aaa (diff)
downloadbundler-5da215b0d0800802b0ecf4f2b7cb6c6a04759dc8.tar.gz
1.9.2 fix
-rw-r--r--lib/bundler/runtime.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/bundler/runtime.rb b/lib/bundler/runtime.rb
index 87ad38401d..c7d6cbf728 100644
--- a/lib/bundler/runtime.rb
+++ b/lib/bundler/runtime.rb
@@ -52,18 +52,19 @@ module Bundler
# groups
next unless (dep.groups & groups).any?
- file = nil
+ required_file = nil
begin
# Loop through all the specified autorequires for the
# dependency. If there are none, use the dependency's name
# as the autorequire.
Array(dep.autorequire || dep.name).each do |file|
+ required_file = file
Kernel.require file
end
rescue LoadError => e
REGEXPS.find { |r| r =~ e.message }
- raise if dep.autorequire || $1 != file
+ raise if dep.autorequire || $1 != required_file
end
end
end