From 06084ebaf7284cc900261977308adfad7d2ebb08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tino=20V=C3=A1zquez?= Date: Tue, 5 Jul 2011 19:03:55 +0200 Subject: [PATCH] feature #667: Improve ACL CLI error handling (cherry picked from commit beba090a3fe6d2ee3721cd65afa16ddb8b5dc8a4) --- src/oca/ruby/OpenNebula/Acl.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/oca/ruby/OpenNebula/Acl.rb b/src/oca/ruby/OpenNebula/Acl.rb index 708a0b5d0f..48a336051e 100644 --- a/src/oca/ruby/OpenNebula/Acl.rb +++ b/src/oca/ruby/OpenNebula/Acl.rb @@ -111,7 +111,9 @@ module OpenNebula end resources[0].split("+").each{ |resource| - next if !RESOURCES[resource.upcase] + if !RESOURCES[resource.upcase] + raise "Resource #{resource} malformed." + end @content[:resources] += RESOURCES[resource.upcase] } @@ -127,7 +129,7 @@ module OpenNebula rights = rights.split("+") rights.each{ |right| - next if !RIGHTS[right.upcase] + raise "Right #{right} malformed." if !RIGHTS[right.upcase] @content[:rights] += RIGHTS[right.upcase] }