1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* 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/trunk@28447 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-06-27 01:41:40 +00:00
parent 967e3a3598
commit 3ca40d2531
3 changed files with 13 additions and 11 deletions

View file

@ -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 13:07:09 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (enable-debug-env): option for RUBY_DEBUG env.

View file

@ -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

View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3"
#define RUBY_RELEASE_DATE "2010-06-26"
#define RUBY_RELEASE_DATE "2010-06-27"
#define RUBY_PATCHLEVEL -1
#define RUBY_BRANCH_NAME "trunk"
@ -8,7 +8,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"