[CalendarServer-changes] [11198] CalendarServer/trunk/twistedcaldav/timezones.py
source_changes at macosforge.org
source_changes at macosforge.org
Wed May 15 19:30:44 PDT 2013
Revision: 11198
http://trac.calendarserver.org//changeset/11198
Author: cdaboo at apple.com
Date: 2013-05-15 19:30:44 -0700 (Wed, 15 May 2013)
Log Message:
-----------
If config data directory does not exist, always use the package timezone files - this helps with unit tests
that use a standard config using /var/caldav but don't need to copy zoneinfo all the time.
Modified Paths:
--------------
CalendarServer/trunk/twistedcaldav/timezones.py
Modified: CalendarServer/trunk/twistedcaldav/timezones.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/timezones.py 2013-05-16 02:16:59 UTC (rev 11197)
+++ CalendarServer/trunk/twistedcaldav/timezones.py 2013-05-16 02:30:44 UTC (rev 11198)
@@ -72,7 +72,7 @@
if TimezoneCache.dirName is None:
if config.TimezoneService.Enabled and config.TimezoneService.BasePath:
TimezoneCache.dirName = config.TimezoneService.BasePath
- elif config.UsePackageTimezones:
+ elif config.UsePackageTimezones or not os.path.exists(config.DataRoot):
TimezoneCache.dirName = TimezoneCache._getPackageDBPath()
else:
TimezoneCache.dirName = os.path.join(config.DataRoot, "zoneinfo")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130515/0b1775c8/attachment.html>
More information about the calendarserver-changes
mailing list