1
0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00

Merge branch 'bug-3037'

This commit is contained in:
Javi Fontan 2014-10-10 15:37:14 +02:00
commit 36a35fc10c
3 changed files with 12 additions and 2 deletions

View File

@ -15,6 +15,7 @@
#--------------------------------------------------------------------------- #
require 'optparse'
require 'optparse/time'
require 'pp'
class String
@ -28,6 +29,17 @@ 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={

View File

@ -15,7 +15,6 @@
#--------------------------------------------------------------------------- #
require 'one_helper'
require 'optparse/time'
class AcctHelper < OpenNebulaHelper::OneHelper
START_TIME = {

View File

@ -15,7 +15,6 @@
#--------------------------------------------------------------------------- #
require 'one_helper'
require 'optparse/time'
class OneVMHelper < OpenNebulaHelper::OneHelper
MULTIPLE={