From d0933d83ec4eb8c9c9c6589c6be240721b3b5dd0 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Wed, 8 Sep 2010 19:52:03 +0200 Subject: [PATCH] bug #341: bug in api calling exit instead of returning error to the caller --- src/oca/ruby/OpenNebula/ImageRepository.rb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/oca/ruby/OpenNebula/ImageRepository.rb b/src/oca/ruby/OpenNebula/ImageRepository.rb index f80638cc83..20f0d224a0 100644 --- a/src/oca/ruby/OpenNebula/ImageRepository.rb +++ b/src/oca/ruby/OpenNebula/ImageRepository.rb @@ -7,15 +7,14 @@ module OpenNebula def create(image, template, copy=true) if image.nil? error_msg = "Image could not be found, aborting." - result = OpenNebula::Error.new(error_msg) + return OpenNebula::Error.new(error_msg) end # ------ Allocate the Image ------ result = image.allocate(template) if OpenNebula.is_error?(result) - puts result.message - exit -1 + return result end @@ -29,7 +28,7 @@ module OpenNebula if !File.exists?(file_path) error_msg = "Image file could not be found, aborting." - result = OpenNebula::Error.new(error_msg) + return OpenNebula::Error.new(error_msg) end result = copy(file_path, image['SOURCE']) @@ -61,7 +60,7 @@ module OpenNebula def delete(image) if image.nil? error_msg = "Image could not be found, aborting." - result = OpenNebula::Error.new(error_msg) + return OpenNebula::Error.new(error_msg) end result = image.info @@ -82,7 +81,7 @@ module OpenNebula def update_source(image, source) if image.nil? error_msg = "Image could not be found, aborting." - result = OpenNebula::Error.new(error_msg) + return OpenNebula::Error.new(error_msg) end result = image.info