From 1363fdacdd06dc014c06e0c97e67c1b9bf97365a Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Tue, 18 Nov 2014 18:01:04 +0100 Subject: [PATCH] Bug #3341: Temporary fix that fixes de broken pipe use but breaks the CLI SSL support for Ruby 1.8.7 (cherry picked from commit f40d69d0bdb22712b2b8b2f68fde235f68c2e725) --- src/cli/one_helper.rb | 11 ++++++++++- src/cli/one_helper/oneuser_helper.rb | 12 +++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/cli/one_helper.rb b/src/cli/one_helper.rb index 5935c3f1e7..e0d884f76e 100644 --- a/src/cli/one_helper.rb +++ b/src/cli/one_helper.rb @@ -370,7 +370,16 @@ EOT endpoint=options[:endpoint] end - @@client=OpenNebula::Client.new(secret, endpoint, :sync => true) + # This breaks the CLI SSL support for Ruby 1.8.7, but is necessary + # in order to do template updates, otherwise you get the broken pipe + # error (bug #3341) + if RUBY_VERSION < '1.9' + sync = false + else + sync = true + end + + @@client=OpenNebula::Client.new(secret, endpoint, :sync => sync) end end diff --git a/src/cli/one_helper/oneuser_helper.rb b/src/cli/one_helper/oneuser_helper.rb index d53e190c10..4d567c6d8c 100644 --- a/src/cli/one_helper/oneuser_helper.rb +++ b/src/cli/one_helper/oneuser_helper.rb @@ -162,10 +162,20 @@ class OneUserHelper < OpenNebulaHelper::OneHelper # Authenticate with oned using the token/passwd and set/generate the # authentication token for the user #----------------------------------------------------------------------- + + # This breaks the CLI SSL support for Ruby 1.8.7, but is necessary + # in order to do template updates, otherwise you get the broken pipe + # error (bug #3341) + if RUBY_VERSION < '1.9' + sync = false + else + sync = true + end + token = auth.login_token(username, options[:time]) login_client = OpenNebula::Client.new("#{username}:#{token}", nil, - :sync => true) + :sync => sync) user = OpenNebula::User.new(User.build_xml, login_client)