diff options
| -rw-r--r-- | lib/bundler.rb | 1 | ||||
| -rw-r--r-- | lib/bundler/fetcher.rb | 4 | ||||
| -rw-r--r-- | lib/bundler/rubygems_integration.rb | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/lib/bundler.rb b/lib/bundler.rb index 410f9df1..e6589918 100644 --- a/lib/bundler.rb +++ b/lib/bundler.rb @@ -60,7 +60,6 @@ module Bundler class InvalidOption < DslError ; end class HTTPError < BundlerError; status_code(17) ; end class RubyVersionMismatch < BundlerError; status_code(18) ; end - class PrereleaseFetchError < BundlerError; status_code(19) ; end WINDOWS = RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw)! diff --git a/lib/bundler/fetcher.rb b/lib/bundler/fetcher.rb index 9c420946..6d69e5e3 100644 --- a/lib/bundler/fetcher.rb +++ b/lib/bundler/fetcher.rb @@ -65,6 +65,8 @@ module Bundler def specs(gem_names, source) index = Index.new + specs = nil + if !gem_names || @remote_uri.scheme == "file" || Bundler::Fetcher.disable_endpoint Bundler.ui.info "Fetching source index from #{strip_user_pass_from_uri(@remote_uri)}" specs = fetch_all_remote_specs @@ -205,8 +207,6 @@ module Bundler Bundler.rubygems.fetch_all_remote_specs rescue Gem::RemoteFetcher::FetchError raise HTTPError, "Could not reach #{strip_user_pass_from_uri(@remote_uri)}" - rescue PrereleaseFetchError - Bundler.ui.debug "Could not fetch prerelease specs from #{strip_user_pass_from_uri(@remote_uri)}" end end diff --git a/lib/bundler/rubygems_integration.rb b/lib/bundler/rubygems_integration.rb index e31f5ac4..ac841d7d 100644 --- a/lib/bundler/rubygems_integration.rb +++ b/lib/bundler/rubygems_integration.rb @@ -93,8 +93,8 @@ module Bundler # Then fetch the prerelease specs begin Gem::SpecFetcher.new.list(false, true).each {|k, v| spec_list[k] += v } - rescue Gem::RemoteFetcher::FetchError - raise PrereleaseFetchError + rescue Gem::RemoteFetcher::FetchError => e + # ignore if we can't fetch the prerelease specs end end |