[CalendarServer-changes] [12932] CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools /purge.py

[source_changes at macosforge.org]

Revision: 12932
          http://trac.calendarserver.org//changeset/12932
Author:   sagen at apple.com
Date:     2014-03-17 13:57:35 -0700 (Mon, 17 Mar 2014)
Log Message:
-----------
Commenting out references to DirectoryRecord; this tool needs to be changed not to require them

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/purge.py

Modified: CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/purge.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/purge.py	2014-03-17 19:18:58 UTC (rev 12931)
+++ CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/purge.py	2014-03-17 20:57:35 UTC (rev 12932)
@@ -30,7 +30,7 @@
 from twisted.internet.defer import inlineCallbacks, returnValue
 
 from twistedcaldav import caldavxml
-from twistedcaldav.directory.directory import DirectoryRecord
+# from twistedcaldav.directory.directory import DirectoryRecord
 
 from txdav.caldav.datastore.query.filter import Filter
 from txdav.xml import element as davxml
@@ -735,15 +735,15 @@
 
         # Does the record exist?
         record = self.directory.recordWithUID(uid)
-        if record is None:
+        # if record is None:
             # The user has already been removed from the directory service.  We
             # need to fashion a temporary, fake record
 
             # FIXME: probably want a more elegant way to accomplish this,
             # since it requires the aggregate directory to examine these first:
-            record = DirectoryRecord(self.directory, "users", uid, shortNames=(uid,), enabledForCalendaring=True)
-            self.directory._tmpRecords["shortNames"][uid] = record
-            self.directory._tmpRecords["uids"][uid] = record
+            # record = DirectoryRecord(self.directory, "users", uid, shortNames=(uid,), enabledForCalendaring=True)
+            # self.directory._tmpRecords["shortNames"][uid] = record
+            # self.directory._tmpRecords["uids"][uid] = record
 
         # Override augments settings for this record
         record.enabled = True
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140317/d42ece38/attachment-0001.html>