diff --git a/src/image/ImageManagerActions.cc b/src/image/ImageManagerActions.cc index e7092b2460..e507967d32 100644 --- a/src/image/ImageManagerActions.cc +++ b/src/image/ImageManagerActions.cc @@ -64,7 +64,8 @@ Image * ImageManager::acquire_image(int vm_id, const string& name, int uid, stri if ( img == 0 ) { ostringstream oss; - oss << "Image " << name << " does not exist for user " << uid; + oss << "User " << uid << " does not own an image with name: " << name + << " . Set IMAGE_UNAME or IMAGE_UID of owner in DISK."; error = oss.str(); return 0; diff --git a/src/vm/vm_file_var_syntax.y b/src/vm/vm_file_var_syntax.y index c82c8779d8..2fc5df034a 100644 --- a/src/vm/vm_file_var_syntax.y +++ b/src/vm/vm_file_var_syntax.y @@ -117,6 +117,17 @@ int get_image_path(VirtualMachine * vm, } img = ipool->get(val1, uid, true); + + if ( img == 0 ) + { + ostringstream oss; + oss << "User " << uid << " does not own an image with name: " << val1 + << " . Set IMAGE_UNAME or IMAGE_UID of owner."; + + error_str = oss.str(); + + return -1; + } } else if ( var1 == "IMAGE_ID" ) { @@ -126,11 +137,20 @@ int get_image_path(VirtualMachine * vm, { img = ipool->get(iid, true); } - } - if ( img == 0 ) + if ( img == 0 ) + { + ostringstream oss; + oss << "Image with ID: " << iid << " does not exist"; + + error_str = oss.str(); + + return -1; + } + } + else { - error_str = "Cannot get image (check name/ID or try IMAGE_UNAME or IMAGE_UID)."; + error_str = "Cannot get image, set IMAGE_ID or IMAGE."; return -1; }