Merge remote-tracking branch 'origin/pycurl' into planetlab-4_0-branch

[plcapi.git] / PLC / Methods / DeletePerson.py

diff --git a/PLC/Methods/DeletePerson.py b/PLC/Methods/DeletePerson.py
index 2a6e8cc..448f808 100644 (file)
--- a/PLC/Methods/DeletePerson.py
+++ b/PLC/Methods/DeletePerson.py
@@ -30,8 +30,10 @@ class DeletePerson(Method):
         persons = Persons(self.api, [person_id_or_email])
         if not persons:
             raise PLCInvalidArgument, "No such account"
+        person = persons[0]
 
-        person = persons.values()[0]
+        if person['peer_id'] is not None:
+            raise PLCInvalidArgument, "Not a local account"
 
         # Authenticated function
         assert self.caller is not None
@@ -41,5 +43,9 @@ class DeletePerson(Method):
             raise PLCPermissionDenied, "Not allowed to delete specified account"
 
         person.delete()
+       
+       # Logging variables
+       self.event_objects = {'Person': [person['person_id']]}
+       self.message = 'Person %d deleted' % person['person_id']
 
         return 1