From c7196790301d10cefe48ab3fa7d279586980d1ee Mon Sep 17 00:00:00 2001
From: Andre Arko <andre@arko.net>
Date: Thu, 22 Apr 2010 08:51:29 -0700
Subject: Loading Bundler in a bundle should leave gem's #load_paths alone

---
 lib/bundler/rubygems_ext.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'lib/bundler/rubygems_ext.rb')

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
-- 
cgit v1.2.1