[CalendarServer-changes] [5659] CalendarServer/branches/new-store
source_changes at macosforge.org
source_changes at macosforge.org
Wed May 26 15:40:18 PDT 2010
Revision: 5659
http://trac.macosforge.org/projects/calendarserver/changeset/5659
Author: glyph at apple.com
Date: 2010-05-26 15:40:16 -0700 (Wed, 26 May 2010)
Log Message:
-----------
catch up more
Modified Paths:
--------------
CalendarServer/branches/new-store/calendarserver/tools/util.py
CalendarServer/branches/new-store/twistedcaldav/stdconfig.py
Property Changed:
----------------
CalendarServer/branches/new-store/
Property changes on: CalendarServer/branches/new-store
___________________________________________________________________
Modified: svn:mergeinfo
- /CalendarServer/branches/config-separation:4379-4443
/CalendarServer/branches/egg-info-351:4589-4625
/CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627:3628-3644
/CalendarServer/branches/users/cdaboo/more-sharing-5591:5592-5601
/CalendarServer/branches/users/cdaboo/partition-4464:4465-4957
/CalendarServer/branches/users/cdaboo/relative-config-paths-5070:5071-5105
/CalendarServer/branches/users/cdaboo/shared-calendars-5187:5188-5440
/CalendarServer/branches/users/glyph/contacts-server-merge:4971-5080
/CalendarServer/branches/users/glyph/sendfdport:5388-5424
/CalendarServer/branches/users/glyph/use-system-twisted:5084-5149
/CalendarServer/branches/users/sagen/locations-resources:5032-5051
/CalendarServer/branches/users/sagen/locations-resources-2:5052-5061
/CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
/CalendarServer/branches/users/sagen/resources-2:5084-5093
/CalendarServer/branches/users/wsanchez/transations:5515-5593
/CalendarServer/trunk:5594-5655
+ /CalendarServer/branches/config-separation:4379-4443
/CalendarServer/branches/egg-info-351:4589-4625
/CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627:3628-3644
/CalendarServer/branches/users/cdaboo/more-sharing-5591:5592-5601
/CalendarServer/branches/users/cdaboo/partition-4464:4465-4957
/CalendarServer/branches/users/cdaboo/relative-config-paths-5070:5071-5105
/CalendarServer/branches/users/cdaboo/shared-calendars-5187:5188-5440
/CalendarServer/branches/users/glyph/contacts-server-merge:4971-5080
/CalendarServer/branches/users/glyph/sendfdport:5388-5424
/CalendarServer/branches/users/glyph/use-system-twisted:5084-5149
/CalendarServer/branches/users/sagen/locations-resources:5032-5051
/CalendarServer/branches/users/sagen/locations-resources-2:5052-5061
/CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
/CalendarServer/branches/users/sagen/resources-2:5084-5093
/CalendarServer/branches/users/wsanchez/transations:5515-5593
/CalendarServer/trunk:5594-5658
Modified: CalendarServer/branches/new-store/calendarserver/tools/util.py
===================================================================
--- CalendarServer/branches/new-store/calendarserver/tools/util.py 2010-05-26 22:32:37 UTC (rev 5658)
+++ CalendarServer/branches/new-store/calendarserver/tools/util.py 2010-05-26 22:40:16 UTC (rev 5659)
@@ -33,7 +33,7 @@
from twistedcaldav.config import config, ConfigurationError
from twistedcaldav.directory import augment, calendaruserproxy
from twistedcaldav.directory.aggregate import AggregateDirectoryService
-from twistedcaldav.directory.directory import DirectoryService, DirectoryRecord
+from twistedcaldav.directory.directory import DirectoryService, DirectoryRecord, DirectoryError
from twistedcaldav.notify import installNotificationClient
from twistedcaldav.static import CalendarHomeProvisioningFile
from twistedcaldav.stdconfig import DEFAULT_CONFIG_FILE
@@ -96,7 +96,11 @@
# Load augment/proxy db classes now
augmentClass = namedClass(config.AugmentService.type)
- augment.AugmentService = augmentClass(**config.AugmentService.params)
+ try:
+ augment.AugmentService = augmentClass(**config.AugmentService.params)
+ except IOError, e:
+ # FIXME: Augments DB tries to write to disk, which seems annoying
+ raise DirectoryError(e)
proxydbClass = namedClass(config.ProxyDBService.type)
calendaruserproxy.ProxyDBService = proxydbClass(**config.ProxyDBService.params)
Modified: CalendarServer/branches/new-store/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/branches/new-store/twistedcaldav/stdconfig.py 2010-05-26 22:32:37 UTC (rev 5658)
+++ CalendarServer/branches/new-store/twistedcaldav/stdconfig.py 2010-05-26 22:40:16 UTC (rev 5659)
@@ -863,13 +863,13 @@
try:
password = getPasswordFromKeychain(service["JID"])
service["Password"] = password
- log.info("XMPP password successfully retreived from keychain")
+ log.info("XMPP password retreived from keychain")
except KeychainAccessError:
# The system doesn't support keychain
pass
except KeychainPasswordNotFound:
# The password doesn't exist in the keychain.
- log.error("XMPP password not found in keychain")
+ log.info("XMPP password not found in keychain")
# Check for empty fields
for key, value in service.iteritems():
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100526/9bb873ba/attachment.html>
More information about the calendarserver-changes
mailing list