From 5550ccf3e4d5ba9e59ad91a409b55eb0096fef3e Mon Sep 17 00:00:00 2001
From: Javi Fontan <jfontan@opennebula.org>
Date: Thu, 30 Oct 2014 16:00:05 +0100
Subject: [PATCH] Revert "bug #3037: parse US time in ruby > 1.8.7"

This reverts commit f944559c51389a107d4be6e8f6b8e560a4faad70.
---
 src/cli/command_parser.rb            | 12 ------------
 src/cli/one_helper/oneacct_helper.rb |  1 +
 src/cli/one_helper/onevm_helper.rb   |  1 +
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/cli/command_parser.rb b/src/cli/command_parser.rb
index 748f302d6d..d9bc504ef6 100644
--- a/src/cli/command_parser.rb
+++ b/src/cli/command_parser.rb
@@ -15,7 +15,6 @@
 #--------------------------------------------------------------------------- #
 
 require 'optparse'
-require 'optparse/time'
 require 'pp'
 
 class String
@@ -29,17 +28,6 @@ class String
     end
 end
 
-if RUBY_VERSION > '1.8.7'
-    OptionParser.accept(Time) do |s,|
-        begin
-            (Time.strptime(s, "%m/%d/%Y %H:%M:%S")) if s
-        rescue
-            raise OptionParser::InvalidArgument, s
-        end
-    end
-end
-
-
 module CommandParser
     OPTIONS = [
         VERBOSE={
diff --git a/src/cli/one_helper/oneacct_helper.rb b/src/cli/one_helper/oneacct_helper.rb
index 3b6b4d9c55..55187c696d 100644
--- a/src/cli/one_helper/oneacct_helper.rb
+++ b/src/cli/one_helper/oneacct_helper.rb
@@ -15,6 +15,7 @@
 #--------------------------------------------------------------------------- #
 
 require 'one_helper'
+require 'optparse/time'
 
 class AcctHelper < OpenNebulaHelper::OneHelper
     START_TIME = {
diff --git a/src/cli/one_helper/onevm_helper.rb b/src/cli/one_helper/onevm_helper.rb
index d0ada42864..5dd840c45b 100644
--- a/src/cli/one_helper/onevm_helper.rb
+++ b/src/cli/one_helper/onevm_helper.rb
@@ -15,6 +15,7 @@
 #--------------------------------------------------------------------------- #
 
 require 'one_helper'
+require 'optparse/time'
 
 class OneVMHelper < OpenNebulaHelper::OneHelper
     MULTIPLE={