aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-01 04:48:36 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-01 04:48:36 +0000
commit6e46c0485022917576837a3daafa3e05a9d1166f (patch)
tree65ef9d61c61af5cef3fe2da8a53430adf3d28e36
parentf593911dbe7dc70d53c7626db75cb63ee7421803 (diff)
downloadruby-6e46c0485022917576837a3daafa3e05a9d1166f.tar.gz
* lib/rubygems/specification.rb: Don't add default gems to $LOAD_PATH
as they are already there. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38104 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/rubygems/specification.rb2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4fd5c76d6f..0c40a7669c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Dec 1 13:48:13 2012 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/specification.rb: Don't add default gems to $LOAD_PATH
+ as they are already there.
+
Sat Dec 1 12:22:17 2012 Kouhei Sutou <kou@cozmixng.org>
* re-added r38053 that is reverted by r38061. Problems by r38053
diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb
index 37044dac85..23393f2025 100644
--- a/lib/rubygems/specification.rb
+++ b/lib/rubygems/specification.rb
@@ -1244,6 +1244,8 @@ class Gem::Specification
# Adds this spec's require paths to LOAD_PATH, in the proper location.
def add_self_to_load_path
+ return if default_gem?
+
paths = require_paths.map do |path|
File.join full_gem_path, path
end