diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-27 01:41:40 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-27 01:41:40 +0000 |
| commit | e824b15653bfc576faa15c4f49d03f6b249cf3d1 (patch) | |
| tree | 9b40a0d4c556b033688d972d2dd591751954671c | |
| parent | 0ca0a7cf12407a7974c7bb68bf3de6d4ea74cddc (diff) | |
* lib/rubygems/require_paths_builder.rb (write_require_paths_file_if_needed):
no reason that bin directory should be included in $LOAD_PATH.
it is for executable files, but not libraries. [ruby-core:25936]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28447 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/rubygems/require_paths_builder.rb | 14 | ||||
| -rw-r--r-- | version.h | 4 |
3 files changed, 13 insertions, 11 deletions
@@ -1,3 +1,9 @@ +Sun Jun 27 10:41:38 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/rubygems/require_paths_builder.rb (write_require_paths_file_if_needed): + no reason that bin directory should be included in $LOAD_PATH. + it is for executable files, but not libraries. [ruby-core:25936] + Sat Jun 26 11:56:31 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * common.mk (clear-installed-list): put redirection before set diff --git a/lib/rubygems/require_paths_builder.rb b/lib/rubygems/require_paths_builder.rb index a77818603b..5cf41b9da8 100644 --- a/lib/rubygems/require_paths_builder.rb +++ b/lib/rubygems/require_paths_builder.rb @@ -2,15 +2,11 @@ require 'rubygems' module Gem::RequirePathsBuilder def write_require_paths_file_if_needed(spec = @spec, gem_home = @gem_home) - return if spec.require_paths == ["lib"] && - (spec.bindir.nil? || spec.bindir == "bin") - file_name = File.join(gem_home, 'gems', "#{@spec.full_name}", ".require_paths") - file_name.untaint - File.open(file_name, "w") do |file| - spec.require_paths.each do |path| - file.puts path - end - file.puts spec.bindir if spec.bindir + require_paths = spec.require_paths + return if require_paths.size == 1 and require_paths.first == "lib" + file_name = "#{gem_home}/gems/#{@spec.full_name}/.require_paths".untaint + File.open(file_name, "wb") do |file| + file.puts require_paths end end end @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_RELEASE_DATE "2010-06-26" +#define RUBY_RELEASE_DATE "2010-06-27" #define RUBY_PATCHLEVEL -1 #define RUBY_VERSION_MAJOR 1 @@ -7,7 +7,7 @@ #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2010 #define RUBY_RELEASE_MONTH 6 -#define RUBY_RELEASE_DAY 26 +#define RUBY_RELEASE_DAY 27 #include "ruby/version.h" |