From 2b862d852c187144116f0bd1f61a3cf928d55ee3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Font=C3=A1n=20Mui=C3=B1os?= <jfontan@fdi.ucm.es>
Date: Tue, 14 Jul 2009 11:46:27 +0000
Subject: [PATCH] Changes in error messages

git-svn-id: http://svn.opennebula.org/one/trunk@684 3034c82b-c49b-4eb3-8279-a7acafdc01c0
---
 src/rm/RequestManagerMigrate.cc    | 12 ++++++------
 src/rm/RequestManagerUserDelete.cc |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/rm/RequestManagerMigrate.cc b/src/rm/RequestManagerMigrate.cc
index 5907d5dd81..b5f37863c7 100644
--- a/src/rm/RequestManagerMigrate.cc
+++ b/src/rm/RequestManagerMigrate.cc
@@ -89,9 +89,9 @@ void RequestManager::VirtualMachineMigrate::execute(
     // Only oneadmin or the VM owner can perform operations upon the VM
     rc = VirtualMachineMigrate::upool->authenticate(session);
     
-    if ( rc != 0 && rc != uid)                             
-    {                                            
-        goto error_authenticate;                     
+    if ( rc != 0 && rc != uid)
+    {
+        goto error_authenticate;
     }
     
     if ((vm->get_state() != VirtualMachine::ACTIVE) ||
@@ -117,7 +117,7 @@ void RequestManager::VirtualMachineMigrate::execute(
     }
     else
     {
-        dm->migrate(vm);    
+        dm->migrate(vm);
     }
     
     vm->unlock();
@@ -150,13 +150,13 @@ error_vm_get:
 error_history:
 	vm->unlock();
 	
-    oss << "Can not deploy VM " << vid << ", can not insert history";    
+    oss << "Can not migrate VM " << vid << ", can not insert history";    
     goto error_common;
 
 error_state:
 	vm->unlock();
 	
-    oss << "Can not deploy VM " << vid << ", wrong state";
+    oss << "Can not migrate VM " << vid << ", wrong state";
     goto error_common;
 
 error_common:
diff --git a/src/rm/RequestManagerUserDelete.cc b/src/rm/RequestManagerUserDelete.cc
index aabf454cae..6cbdfd8287 100644
--- a/src/rm/RequestManagerUserDelete.cc
+++ b/src/rm/RequestManagerUserDelete.cc
@@ -52,9 +52,9 @@ void RequestManager::UserDelete::execute(
     // Only oneadmin can delete users
     rc = UserDelete::upool->authenticate(session);
     
-    if ( rc != 0 )                             
-    {                                            
-        goto error_authenticate;                     
+    if ( rc != 0 )
+    {
+        goto error_authenticate;
     }
 
     // Now let's get the user 
@@ -90,7 +90,7 @@ error_oneadmin_deletion:
     goto error_common;
 
 error_authenticate:
-    oss << "User not authorized to add new users";
+    oss << "User not authorized to delete users";
     goto error_common;
     
 error_get_user: