archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 09:33:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

* backport r33074 from trunk

Browse source 
* lib/rubygems:  Update to RubyGems 1.8.10.  Fixes security issue in
  creating ruby-format gemspecs.  Fixes Gem.dir not being at the front
  of Gem.path to fix uninstall and cleanup commands.  Fixes gem
  uninstall stopping on the first missing gem.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33075 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
drbrain 2011-08-26 01:12:57 +00:00
parent 322937ff00
commit f5c8aecebc
12 changed files with 208 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

21
lib/rubygems/path_support.rb
View file

@ -1,5 +1,4 @@
##
#
# Gem::PathSupport facilitates the GEM_HOME and GEM_PATH environment settings
# to the rest of RubyGems.
#
@ -43,18 +42,16 @@ class Gem::PathSupport
# Set the Gem search path (as reported by Gem.path).
def path=(gpaths)
# FIX: it should be [home, *path], not [*path, home]
gem_path = []
gem_path = [@home]
# FIX: I can't tell wtf this is doing.
gpaths ||= (ENV['GEM_PATH'] || "").empty? ? nil : ENV["GEM_PATH"]
if gpaths
if gpaths.kind_of?(Array)
gem_path = gpaths.dup
if gpaths then
if gpaths.kind_of?(Array) then
gem_path.push(*gpaths)
else
gem_path = gpaths.split(File::PATH_SEPARATOR)
gem_path.push(*gpaths.split(File::PATH_SEPARATOR))
end
if File::ALT_SEPARATOR then
@ -62,14 +59,10 @@ class Gem::PathSupport
this_path.gsub File::ALT_SEPARATOR, File::SEPARATOR
end
end
gem_path << @home
else
gem_path = Gem.default_path + [@home]
gem_path.push(*Gem.default_path)
if defined?(APPLE_GEM_HOME)
gem_path << APPLE_GEM_HOME
end
gem_path << APPLE_GEM_HOME if defined?(APPLE_GEM_HOME)
end
@path = gem_path.uniq