lib/rubygems/dependency_installer.rb in rubygems-update-1.1.0 vs lib/rubygems/dependency_installer.rb in rubygems-update-1.1.1
- old
+ new
@@ -70,11 +70,11 @@
requirements = dep.version_requirements.requirements.map do |req, ver|
req
end
all = requirements.length > 1 ||
- requirements.first != ">=" || requirements.first != ">"
+ (requirements.first != ">=" and requirements.first != ">")
found = Gem::SourceInfoCache.search_with_source dep, true, all
gems_and_sources.push(*found)
@@ -187,10 +187,16 @@
# TODO: make this sorta_verbose so other users can benefit from it
say "Installing gem #{spec.full_name}" if Gem.configuration.really_verbose
_, source_uri = @specs_and_sources.assoc spec
- local_gem_path = Gem::RemoteFetcher.fetcher.download spec, source_uri
+ begin
+ local_gem_path = Gem::RemoteFetcher.fetcher.download spec, source_uri,
+ @install_dir
+ rescue Gem::RemoteFetcher::FetchError
+ next if @force
+ raise
+ end
inst = Gem::Installer.new local_gem_path,
:env_shebang => @env_shebang,
:force => @force,
:format_executable => @format_executable,