summaryrefslogtreecommitdiff
path: root/lib/bundler/rubygems_ext.rb
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2010-04-22 08:51:29 -0700
committerAndre Arko <andre@arko.net>2010-04-23 10:19:27 -0700
commitc7196790301d10cefe48ab3fa7d279586980d1ee (patch)
tree1205845db6feef077ff846c985feadedd6dc01fa /lib/bundler/rubygems_ext.rb
parenteb27834cf2c169b8b715ab8723b107b498c2435e (diff)
downloadbundler-c7196790301d10cefe48ab3fa7d279586980d1ee.tar.gz
Loading Bundler in a bundle should leave gem's #load_paths alone
Diffstat (limited to 'lib/bundler/rubygems_ext.rb')
-rw-r--r--lib/bundler/rubygems_ext.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/bundler/rubygems_ext.rb b/lib/bundler/rubygems_ext.rb
index 8d8aefe2f9..5ec1143361 100644
--- a/lib/bundler/rubygems_ext.rb
+++ b/lib/bundler/rubygems_ext.rb
@@ -10,7 +10,13 @@ module Gem
attr_accessor :source, :location
def load_paths
- require_paths.map {|p| File.join(full_gem_path, p) }
+ require_paths.map do |require_path|
+ if require_path.include?(full_gem_path)
+ require_path
+ else
+ File.join(full_gem_path, require_path)
+ end
+ end
end
def groups