diff options
| author | Andre Arko <andre@arko.net> | 2013-02-12 22:12:06 -0800 |
|---|---|---|
| committer | Andre Arko <andre@arko.net> | 2013-02-12 22:12:06 -0800 |
| commit | 37569d521c49b516fe77197ee75341b20f74ad29 (patch) | |
| tree | 468131d95f27b513405af74d9ca095a54562ff98 /lib/bundler/fetcher.rb | |
| parent | 4e7a5e91f98d24ce33da962d25eef69f10a8bf88 (diff) | |
| parent | 1c50e8b9e4a87ece745d28b17118d99b25d65ee1 (diff) | |
| download | bundler-37569d521c49b516fe77197ee75341b20f74ad29.tar.gz | |
Merge branch '1-2-stable'
Conflicts:
.rspec
.travis.yml
CHANGELOG.md
Rakefile
lib/bundler.rb
lib/bundler/cli.rb
lib/bundler/source.rb
lib/bundler/version.rb
spec/bundler/bundler_spec.rb
spec/install/gems/dependency_api_spec.rb
spec/other/newgem_spec.rb
spec/other/show_spec.rb
Diffstat (limited to 'lib/bundler/fetcher.rb')
| -rw-r--r-- | lib/bundler/fetcher.rb | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/bundler/fetcher.rb b/lib/bundler/fetcher.rb index 9253055f04..b9855fc712 100644 --- a/lib/bundler/fetcher.rb +++ b/lib/bundler/fetcher.rb @@ -94,11 +94,8 @@ module Bundler # new line now that the dots are over Bundler.ui.info "" unless Bundler.ui.debug? - if @remote_uri.to_s.include?("rubygems.org") - Bundler.ui.info "Error #{e.class} during request to dependency API" - end - Bundler.ui.debug e.message - Bundler.ui.debug e.backtrace + Bundler.ui.debug "Error during API request. #{e.class}: #{e.message}" + Bundler.ui.debug e.backtrace.join(" ") Bundler.ui.info "Fetching full source index from #{@public_uri}" specs = fetch_all_remote_specs @@ -179,8 +176,10 @@ module Bundler when Net::HTTPRedirection Bundler.ui.debug("HTTP Redirection") new_uri = URI.parse(response["location"]) - new_uri.user = uri.user - new_uri.password = uri.password + if new_uri.host == uri.host + new_uri.user = uri.user + new_uri.password = uri.password + end fetch(new_uri, counter + 1) when Net::HTTPSuccess Bundler.ui.debug("HTTP Success") |