Merge branch 'master' of ssh://git.onelab.eu/git/plcapi

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

diff --git a/PLC/Methods/DeleteKey.py b/PLC/Methods/DeleteKey.py
index bdd3397..51c40d4 100644 (file)
--- a/PLC/Methods/DeleteKey.py
+++ b/PLC/Methods/DeleteKey.py
@@ -30,11 +30,17 @@ class DeleteKey(Method):
             raise PLCInvalidArgument, "No such key"
         key = keys[0]
 
+        if key['peer_id'] is not None:
+            raise PLCInvalidArgument, "Not a local key"
+
         if 'admin' not in self.caller['roles']:
             if key['key_id'] not in self.caller['key_ids']:
                 raise PLCPermissionDenied, "Key must be associated with your account"
 
         key.delete()
-       self.object_ids = [key['key_id']]
+
+        # Logging variables
+        self.event_objects = {'Key': [key['key_id']]}
+        self.message = 'Key %d deleted' % key['key_id']
 
         return 1