Merge branch 'master' of ssh://git.planet-lab.org/git/sfa

[sfa.git] / sfa / methods / remove_peer_object.py

diff --git a/sfa/methods/remove_peer_object.py b/sfa/methods/remove_peer_object.py
index 32b756a..866122d 100644 (file)
--- a/sfa/methods/remove_peer_object.py
+++ b/sfa/methods/remove_peer_object.py
@@ -4,7 +4,6 @@ from sfa.util.parameter import Parameter, Mixed
 from sfa.trust.auth import Auth
 from sfa.util.record import SfaRecord
 from sfa.util.table import SfaTable
-from sfa.util.debug import log
 from sfa.trust.credential import Credential
 from types import StringTypes
 
@@ -38,7 +37,7 @@ class remove_peer_object(Method):
         #log the call
         if not origin_hrn:
             origin_hrn = user_cred.get_gid_caller().get_hrn()
-        self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, hrn, self.name))
+        self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, record['hrn'], self.name))
 
         self.api.auth.check(cred, "remove")
 
@@ -50,9 +49,9 @@ class remove_peer_object(Method):
         hrn, type = record['hrn'], record['type']
         records = table.find({'hrn': hrn, 'type': type })
         for record in records:
-         if record['peer_authority']:
-            self.remove_plc_record(record)
-            table.remove(record)
+            if record['peer_authority']:
+                self.remove_plc_record(record)
+                table.remove(record)
             
         return 1