svn keywords

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

diff --git a/PLC/Methods/DeleteKey.py b/PLC/Methods/DeleteKey.py
index 3920db3..a723aaa 100644 (file)
--- a/PLC/Methods/DeleteKey.py
+++ b/PLC/Methods/DeleteKey.py
@@ -1,3 +1,5 @@
+# $Id$
+# $URL$
 from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
@@ -29,7 +31,9 @@ class DeleteKey(Method):
         if not keys:
             raise PLCInvalidArgument, "No such key"
         key = keys[0]
-       PLCCheckLocalKey(key,"DeleteKey")
+
+        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']:
@@ -38,7 +42,7 @@ class DeleteKey(Method):
         key.delete()
        
        # Logging variables
-       self.object_ids = [key['key_id']]
+       self.event_objects = {'Key': [key['key_id']]}
        self.message = 'Key %d deleted' % key['key_id']
 
         return 1