From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.1 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 1750B1F62E; Tue, 19 Jun 2018 03:57:17 +0000 (UTC) From: Eric Wong To: mogilefs-client-public@bogomips.org Cc: Eric Wong Subject: [PATCH 3/3] fix indentation warnings with ruby trunk Date: Tue, 19 Jun 2018 03:57:15 +0000 Message-Id: <20180619035715.13614-4-e@80x24.org> In-Reply-To: <20180619035715.13614-1-e@80x24.org> References: <20180619035715.13614-1-e@80x24.org> List-Id: Ruby trunk started warning about more mismatched indentations starting around r62836. --- lib/mogilefs/backend.rb | 4 ++-- lib/mogilefs/copy_stream.rb | 6 +++--- lib/mogilefs/http_file.rb | 22 +++++++++++----------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/mogilefs/backend.rb b/lib/mogilefs/backend.rb index 7f91508..6d5fe17 100644 --- a/lib/mogilefs/backend.rb +++ b/lib/mogilefs/backend.rb @@ -335,8 +335,8 @@ def clear_cache(types = %w(all)) end end nil - ensure - sockets.each { |io| io.close } + ensure + sockets.each { |io| io.close } end # Returns a socket connected to a MogileFS tracker. diff --git a/lib/mogilefs/copy_stream.rb b/lib/mogilefs/copy_stream.rb index f50bf08..202b2e3 100644 --- a/lib/mogilefs/copy_stream.rb +++ b/lib/mogilefs/copy_stream.rb @@ -23,8 +23,8 @@ def self.copy_stream(src, dst) end dst_io.flush if dst_io.respond_to?(:flush) written - ensure - src_io.close if src.respond_to?(:to_str) - dst_io.close if dst.respond_to?(:to_str) + ensure + src_io.close if src.respond_to?(:to_str) + dst_io.close if dst.respond_to?(:to_str) end end diff --git a/lib/mogilefs/http_file.rb b/lib/mogilefs/http_file.rb index a58801a..aa0bcf2 100644 --- a/lib/mogilefs/http_file.rb +++ b/lib/mogilefs/http_file.rb @@ -83,11 +83,11 @@ def put_streaming_io(sock, uri) # unlikely to be used def rewind_or_raise!(uri, err) @active.rewind if @active - rescue => e - msg = "#{uri} failed with #{err.message} (#{err.class}) and " \ - "retrying is impossible as rewind on " \ - "#{@active.inspect} failed with: #{e.message} (#{e.class})" - raise NonRetryableError, msg, e.backtrace + rescue => e + msg = "#{uri} failed with #{err.message} (#{err.class}) and " \ + "retrying is impossible as rewind on " \ + "#{@active.inspect} failed with: #{e.message} (#{e.class})" + raise NonRetryableError, msg, e.backtrace end ## @@ -127,12 +127,12 @@ def upload(devid, uri) # :nodoc: read_response(sock) # raises on errors file_size - rescue SystemCallError, RetryableError => err - rewind_or_raise!(uri, err) - raise - ensure - file.close if file && @big_io != file - sock.close if sock + rescue SystemCallError, RetryableError => err + rewind_or_raise!(uri, err) + raise + ensure + file.close if file && @big_io != file + sock.close if sock end def nhp_put(devid, uri) -- EW