archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-23 13:04:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Update to RubyGems 1.3.7.pre.1

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
drbrain 2010-04-22 08:24:42 +00:00
parent d0e5a34ac7
commit 372dcece3f
64 changed files with 759 additions and 240 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/rubygems/dependency_installer.rb
View file

@ -69,6 +69,10 @@ class Gem::DependencyInstaller
@install_dir = options[:install_dir] || Gem.dir
@cache_dir = options[:cache_dir] || @install_dir
# Set with any errors that SpecFetcher finds while search through
# gemspecs for a dep
@errors = nil
end
##
@ -78,6 +82,8 @@ class Gem::DependencyInstaller
# local gems preferred over remote gems.
def find_gems_with_sources(dep)
# Reset the errors
@errors = nil
gems_and_sources = []
if @domain == :both or @domain == :local then
@ -99,7 +105,7 @@ class Gem::DependencyInstaller
(requirements.length > 1 or
(requirements.first != ">=" and requirements.first != ">"))
found = Gem::SpecFetcher.fetcher.fetch dep, all, true, dep.prerelease?
found, @errors = Gem::SpecFetcher.fetcher.fetch_with_errors dep, all, true, dep.prerelease?
gems_and_sources.push(*found)
@ -204,8 +210,9 @@ class Gem::DependencyInstaller
end
if spec_and_source.nil? then
raise Gem::GemNotFoundException,
"could not find gem #{gem_name} locally or in a repository"
raise Gem::GemNotFoundException.new(
"Could not find a valid gem '#{gem_name}' (#{version}) locally or in a repository",
gem_name, version, @errors)
end
@specs_and_sources = [spec_and_source]