[CalendarServer-changes] [8830] CalendarServer/trunk/calendarserver/tools/principals.py

[source_changes at macosforge.org]

Revision: 8830
          http://trac.macosforge.org/projects/calendarserver/changeset/8830
Author:   sagen at apple.com
Date:     2012-03-08 15:54:10 -0800 (Thu, 08 Mar 2012)
Log Message:
-----------
Also log when we remove a proxy

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tools/principals.py

Modified: CalendarServer/trunk/calendarserver/tools/principals.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/principals.py	2012-03-08 23:43:09 UTC (rev 8829)
+++ CalendarServer/trunk/calendarserver/tools/principals.py	2012-03-08 23:54:10 UTC (rev 8830)
@@ -657,7 +657,11 @@
 @inlineCallbacks
 def action_removeProxyPrincipal(principal, proxyPrincipal, **kwargs):
     try:
-        (yield removeProxy(principal, proxyPrincipal, **kwargs))
+        removed = (yield removeProxy(principal, proxyPrincipal, **kwargs))
+        if removed:
+            print "Removed %s as a proxy for %s" % (
+                prettyPrincipal(proxyPrincipal),
+                prettyPrincipal(principal))
     except ProxyError, e:
         print "Error:", e
     except ProxyWarning, e:
@@ -666,6 +670,7 @@
 
 @inlineCallbacks
 def removeProxy(principal, proxyPrincipal, **kwargs):
+    removed = False
     proxyTypes = kwargs.get("proxyTypes", ("read", "write"))
     for proxyType in proxyTypes:
         proxyURL = proxyPrincipal.url()
@@ -685,11 +690,15 @@
         if len(memberURLs) == len(membersProperty.children):
             # No change
             continue
+        else:
+            removed = True
 
         membersProperty = davxml.GroupMemberSet(*memberURLs)
         (yield subPrincipal.writeProperty(membersProperty, None))
 
+        returnValue(removed)
 
+
 @inlineCallbacks
 def action_setAutoSchedule(principal, autoSchedule):
     if principal.record.recordType == "groups":
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120308/51a6e464/attachment.html>