diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-08-08 07:08:55 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-08-08 07:08:55 +0000 |
| commit | efbad5fa481a6e34f4d8b9f9355df2a6d7602a95 (patch) | |
| tree | 24ec4d334e57e561b81fb95e0dba4d0b77496f83 | |
| parent | 739e022d006b755b4c6641eda958bdfb5969b65d (diff) | |
* gem_prelude.rb, lib/rubygems.rb (Gem.suffixes): return truely
require-able suffixes only.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28919 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | gem_prelude.rb | 4 | ||||
| -rw-r--r-- | lib/rubygems.rb | 4 |
3 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sun Aug 8 16:08:51 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * gem_prelude.rb, lib/rubygems.rb (Gem.suffixes): return truely + require-able suffixes only. + Sun Aug 8 13:20:57 2010 Tanaka Akira <akr@fsij.org> * ext/pathname/pathname.c (path_ftype): Pathname#ftype translated diff --git a/gem_prelude.rb b/gem_prelude.rb index 017adc2040..55fd9136dc 100644 --- a/gem_prelude.rb +++ b/gem_prelude.rb @@ -34,6 +34,10 @@ if defined?(Gem) then :sitelibdir => RbConfig::CONFIG["sitelibdir"], } + def self.suffixes + ['.rb', ".#{RbConfig::CONFIG["DLEXT"]}"] + end + def self.dir @gem_home ||= nil set_home(ENV['GEM_HOME'] || default_dir) unless @gem_home diff --git a/lib/rubygems.rb b/lib/rubygems.rb index fcb1ebd3db..552c6f6b57 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -903,8 +903,8 @@ module Gem # Suffixes for require-able paths. def self.suffixes - ['', '.rb', '.rbw', '.so', '.bundle', '.dll', '.sl', '.jar'] - end + ['.rb', ".#{RbConfig::CONFIG["DLEXT"]}"] + end unless defined?(suffixes) ## # Prints the amount of time the supplied block takes to run using the debug |