[DRE-commits] [ruby-elasticsearch] 02/04: Adding patch to fix bug

[Macártur Carvalho]

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

macartur-guest pushed a commit to branch master
in repository ruby-elasticsearch.

commit 4fedeea2e86487d7006512d3916b35fb93d78d7b
Author: Macartur Sousa <macartur.sc at gmail.com>
Date:   Wed Jan 25 11:54:31 2017 -0200

    Adding patch to fix bug
    
    Fix bug when :retry_on_status is Nil::Class:
      patches/fixed_transport_client_base.patch
---
 debian/patches/fixed_transport_client_base.patch | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/debian/patches/fixed_transport_client_base.patch b/debian/patches/fixed_transport_client_base.patch
index 76d01c8..c621884 100644
--- a/debian/patches/fixed_transport_client_base.patch
+++ b/debian/patches/fixed_transport_client_base.patch
@@ -6,15 +6,23 @@ Description: Fixing arguments[:retry_on_status]
 Author: Macártur Sousa <macartur.sc at gmail.com>
 Last Update: 2016-08-01
 
-Index: ruby-elasticsearch/elasticsearch-transport/lib/elasticsearch/transport/client.rb
-===================================================================
---- ruby-elasticsearch.orig/elasticsearch-transport/lib/elasticsearch/transport/client.rb	2016-08-08 18:10:35.498058735 -0300
-+++ ruby-elasticsearch/elasticsearch-transport/lib/elasticsearch/transport/client.rb	2016-08-08 18:12:18.389628453 -0300
+--- a/elasticsearch-transport/lib/elasticsearch/transport/client.rb
++++ b/elasticsearch-transport/lib/elasticsearch/transport/client.rb
 @@ -99,6 +99,7 @@
          @arguments[:randomize_hosts]    ||= false
          @arguments[:transport_options]  ||= {}
          @arguments[:http]               ||= {}
-+        @arguments[:retry_on_status]    ||= {}
- 
++        @arguments[:retry_on_status]    ||= []
+
          @arguments[:transport_options].update(:request => { :timeout => @arguments[:request_timeout] } ) if @arguments[:request_timeout]
- 
+
+--- a/elasticsearch-transport/lib/elasticsearch/transport/transport/base.rb
++++ b/elasticsearch-transport/lib/elasticsearch/transport/transport/base.rb
+@@ -34,6 +34,7 @@
+           @hosts       = arguments[:hosts]   || []
+           @options     = arguments[:options] || {}
+           @options[:http] ||= {}
++          @options[:retry_on_status] ||= {}
+
+           @block       = block
+           @connections = __build_connections

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