[DRE-commits] [bundler] 06/07: Improve devendorization of Net::HTTP::Persistent

[Lucas Nussbaum]

This is an automated email from the git hooks/post-receive script.

lucas pushed a commit to branch master
in repository bundler.

commit c71cbd6ddf461eff728584ada868318af4d75db0
Author: Lucas Nussbaum <lucas at debian.org>
Date:   Mon Jul 3 21:55:04 2017 +0200

    Improve devendorization of Net::HTTP::Persistent
---
 debian/patches/unvendorize | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/debian/patches/unvendorize b/debian/patches/unvendorize
index 5da01d4..bac4494 100644
--- a/debian/patches/unvendorize
+++ b/debian/patches/unvendorize
@@ -37,3 +37,23 @@ Origin: vendor
  end
 -require "bundler/vendor/thor/lib/thor"
 +require "thor"
+--- a/lib/bundler/fetcher.rb
++++ b/lib/bundler/fetcher.rb
+@@ -237,7 +237,7 @@ module Bundler
+           Bundler.settings[:ssl_client_cert]
+         raise SSLError if needs_ssl && !defined?(OpenSSL::SSL)
+ 
+-        con = Bundler::Persistent::Net::HTTP::Persistent.new "bundler", :ENV
++        con = Net::HTTP::Persistent.new "bundler", :ENV
+         if gem_proxy = Bundler.rubygems.configuration[:http_proxy]
+           con.proxy = URI.parse(gem_proxy) if gem_proxy != :no_proxy
+         end
+@@ -273,7 +273,7 @@ module Bundler
+       Timeout::Error, EOFError, SocketError, Errno::ENETDOWN, Errno::ENETUNREACH,
+       Errno::EINVAL, Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::EAGAIN,
+       Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError,
+-      Bundler::Persistent::Net::HTTP::Persistent::Error, Zlib::BufError, Errno::EHOSTUNREACH
++      Net::HTTP::Persistent::Error, Zlib::BufError, Errno::EHOSTUNREACH
+     ].freeze
+ 
+     def bundler_cert_store

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/bundler.git