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

[source_changes at macosforge.org]

Revision: 5262
          http://trac.macosforge.org/projects/calendarserver/changeset/5262
Author:   sagen at apple.com
Date:     2010-03-05 15:28:02 -0800 (Fri, 05 Mar 2010)
Log Message:
-----------
Don't crash if given an unknown principal

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

Modified: CalendarServer/trunk/calendarserver/tools/principals.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/principals.py	2010-03-05 21:20:01 UTC (rev 5261)
+++ CalendarServer/trunk/calendarserver/tools/principals.py	2010-03-05 23:28:02 UTC (rev 5262)
@@ -374,7 +374,10 @@
 def action_addProxy(principal, proxyType, *proxyIDs):
     for proxyID in proxyIDs:
         proxyPrincipal = principalForPrincipalID(proxyID)
-        (yield action_addProxyPrincipal(principal, proxyType, proxyPrincipal))
+        if proxyPrincipal is None:
+            print "Invalid principal ID: %s" % (proxyID,)
+        else:
+            (yield action_addProxyPrincipal(principal, proxyType, proxyPrincipal))
 
 @inlineCallbacks
 def action_addProxyPrincipal(principal, proxyType, proxyPrincipal):
@@ -416,7 +419,10 @@
 def action_removeProxy(principal, *proxyIDs, **kwargs):
     for proxyID in proxyIDs:
         proxyPrincipal = principalForPrincipalID(proxyID)
-        (yield action_removeProxyPrincipal(principal, proxyPrincipal, **kwargs))
+        if proxyPrincipal is None:
+            print "Invalid principal ID: %s" % (proxyID,)
+        else:
+            (yield action_removeProxyPrincipal(principal, proxyPrincipal, **kwargs))
 
 @inlineCallbacks
 def action_removeProxyPrincipal(principal, proxyPrincipal, **kwargs):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100305/11793e45/attachment.html>