From c250aa0f884857af185d592d24d11b1183e9a6be Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Tue, 1 Jun 2021 10:55:09 -0400 Subject: [PATCH] 17738: remove the monkey patch of the OS_VERSION constant from the google-api-client gem; we run from a forked version of the gem which already has the necessary fix. Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- sdk/ruby/lib/arvados/google_api_client.rb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sdk/ruby/lib/arvados/google_api_client.rb b/sdk/ruby/lib/arvados/google_api_client.rb index 5a41b11c4f..93d27e649f 100644 --- a/sdk/ruby/lib/arvados/google_api_client.rb +++ b/sdk/ruby/lib/arvados/google_api_client.rb @@ -3,12 +3,6 @@ # SPDX-License-Identifier: Apache-2.0 require 'google/api_client' -# Monkeypatch google-api-client gem to avoid sending newline characters -# on headers to make ruby-2.3.7+ happy. -# See: https://dev.arvados.org/issues/13920 -# Addendum: OS_VERSION sometimes is not mutable, that's why we duplicate it (See: #17738) -Google::APIClient::ENV::OS_VERSION = +Google::APIClient::ENV::OS_VERSION.strip! - require 'json' require 'tempfile' -- 2.30.2