shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

feature #1327: bug in oneimage create that prevented parameter check

Browse Source
This commit is contained in:
Javi Fontan 2012-09-19 18:11:00 +02:00
parent ed15077332
commit 3576b06df0
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/cli/one_helper/oneimage_helper.rb
View File

@ -126,8 +126,8 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
:description => "Size in MB. Used for DATABLOCK type",
:format => String,
:proc => lambda do |o, options|
if !options[:type] || !options[:type].upcase=='DATABLOCK'
[-1, "Size is only used for DATABLOCK type images"]
if !options[:type] || !(options[:type].upcase=='DATABLOCK')
next [-1, "Size is only used for DATABLOCK type images"]
end
m=o.strip.match(/^(\d+(?:\.\d+)?)(m|mb|g|gb)?$/i)
@ -155,10 +155,11 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
"any value understood by mkfs unix command.",
:format => String,
:proc => lambda do |o, options|
if !options[:type] || !options[:type].upcase=='DATABLOCK'
if !options[:type] || !(options[:type].upcase=='DATABLOCK')
[-1, "FSTYPE is only used for DATABLOCK type images"]
else
[0, o]
end
[0, o]
end
}
]