[CalendarServer-changes] [10151] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 10151
          http://trac.calendarserver.org//changeset/10151
Author:   sagen at apple.com
Date:     2012-12-10 16:57:13 -0800 (Mon, 10 Dec 2012)
Log Message:
-----------
Fixes implicit-scheduling-based event deletion from purge tool

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tools/purge.py
    CalendarServer/trunk/twext/web2/dav/auth.py

Modified: CalendarServer/trunk/calendarserver/tools/purge.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/purge.py	2012-12-10 22:17:43 UTC (rev 10150)
+++ CalendarServer/trunk/calendarserver/tools/purge.py	2012-12-11 00:57:13 UTC (rev 10151)
@@ -18,7 +18,6 @@
 
 import os
 import sys
-import traceback
 from errno import ENOENT, EACCES
 from getopt import getopt, GetoptError
 
@@ -775,7 +774,6 @@
                                 except Exception, e:
                                     print "Exception deleting %s/%s/%s: %s" % (uid,
                                         collName, childName, str(e))
-                                    traceback.print_stack()
                                     retry = True
 
                                 if retry and doimplicit:
@@ -790,7 +788,6 @@
                                             incrementCount = True
                                     except Exception, e:
                                         print "Still couldn't delete %s/%s/%s even with implicit scheduling turned off: %s" % (uid, collName, childName, str(e))
-                                        traceback.print_stack()
 
                             if incrementCount:
                                 count += 1

Modified: CalendarServer/trunk/twext/web2/dav/auth.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/auth.py	2012-12-10 22:17:43 UTC (rev 10150)
+++ CalendarServer/trunk/twext/web2/dav/auth.py	2012-12-11 00:57:13 UTC (rev 10151)
@@ -72,7 +72,7 @@
         req.loginInterfaces = self.loginInterfaces
 
         # If not using SSL, use the factory list which excludes "Basic"
-        if req.chanRequest is None: # This is only None in unit tests
+        if getattr(req, "chanRequest", None) is None: # This is only None in unit tests
             secureConnection = True
         else:
             ignored, secureConnection = req.chanRequest.getHostInfo()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20121210/60d01501/attachment.html>