[CalendarServer-changes] [10186] CalendarServer/trunk

source_changes at macosforge.org source_changes at macosforge.org
Mon Dec 17 15:46:44 PST 2012


Revision: 10186
          http://trac.calendarserver.org//changeset/10186
Author:   sagen at apple.com
Date:     2012-12-17 15:46:44 -0800 (Mon, 17 Dec 2012)
Log Message:
-----------
Undo last commit

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tools/config.py
    CalendarServer/trunk/conf/caldavd-apple.plist
    CalendarServer/trunk/contrib/migration/calendarpromotion.py
    CalendarServer/trunk/support/Makefile.Apple
    CalendarServer/trunk/twistedcaldav/stdconfig.py
    CalendarServer/trunk/txdav/common/icommondatastore.py

Modified: CalendarServer/trunk/calendarserver/tools/config.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/config.py	2012-12-17 23:43:46 UTC (rev 10185)
+++ CalendarServer/trunk/calendarserver/tools/config.py	2012-12-17 23:46:44 UTC (rev 10186)
@@ -24,9 +24,11 @@
 import os, sys
 from getopt import getopt, GetoptError
 
-from twistedcaldav.config import config, ConfigurationError
+from twistedcaldav.config import ConfigurationError
 from twistedcaldav.stdconfig import DEFAULT_CONFIG_FILE
 
+from calendarserver.tools.util import loadConfig
+
 def usage(e=None):
     if e:
         print e
@@ -48,17 +50,15 @@
 def main():
     try:
         (optargs, args) = getopt(
-            sys.argv[1:], "hf:w:", [
+            sys.argv[1:], "hf:", [
                 "help",
                 "config=",
-                "write=",
             ],
         )
     except GetoptError, e:
         usage(e)
 
     configFileName = DEFAULT_CONFIG_FILE
-    writeConfigFileName = DEFAULT_CONFIG_FILE
 
     for opt, arg in optargs:
         if opt in ("-h", "--help"):
@@ -67,9 +67,6 @@
         elif opt in ("-f", "--config"):
             configFileName = arg
 
-        elif opt in ("-w", "--write"):
-            writeConfigFileName = arg
-
     try:
         config = loadConfig(configFileName)
     except ConfigurationError, e:

Modified: CalendarServer/trunk/conf/caldavd-apple.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-apple.plist	2012-12-17 23:43:46 UTC (rev 10185)
+++ CalendarServer/trunk/conf/caldavd-apple.plist	2012-12-17 23:46:44 UTC (rev 10186)
@@ -537,11 +537,5 @@
     <key>OpenDirectoryModule</key>
     <string>calendarserver.platform.darwin.od.opendirectory</string>
 
-    <key>Includes</key>
-    <array>
-        <string>/Library/Server/Calendar and Contacts/Config/caldavd-system.plist</string>
-        <string>/Library/Server/Calendar and Contacts/Config/caldavd-user.plist</string>
-    </array>
-
   </dict>
 </plist>

Modified: CalendarServer/trunk/contrib/migration/calendarpromotion.py
===================================================================
--- CalendarServer/trunk/contrib/migration/calendarpromotion.py	2012-12-17 23:43:46 UTC (rev 10185)
+++ CalendarServer/trunk/contrib/migration/calendarpromotion.py	2012-12-17 23:46:44 UTC (rev 10186)
@@ -71,7 +71,6 @@
         # Already exists
         pass
 
-    # XYZZY CHANGE ALL THIS:
     plistPath = os.path.join(DEST_CONFIG_DIR, CALDAVD_PLIST)
 
     if os.path.exists(plistPath):

Modified: CalendarServer/trunk/support/Makefile.Apple
===================================================================
--- CalendarServer/trunk/support/Makefile.Apple	2012-12-17 23:43:46 UTC (rev 10185)
+++ CalendarServer/trunk/support/Makefile.Apple	2012-12-17 23:46:44 UTC (rev 10186)
@@ -85,7 +85,7 @@
 	$(_v) cd $(BuildDirectory)/pycrypto-2.5       && $(Environment) $(PYTHON) setup.py install $(PY_INSTALL_FLAGS)
 	$(_v) for so in $$(find "$(DSTROOT)$(PY_HOME)/lib" -type f -name '*.so'); do $(STRIP) -Sx "$${so}"; done 
 	$(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)$(SIPP)$(ETCDIR)$(CALDAVDSUBDIR)"
-	$(_v) $(INSTALL_FILE) "$(Sources)/conf/caldavd-apple.plist" "$(DSTROOT)$(SIPP)$(ETCDIR)$(CALDAVDSUBDIR)/caldavd-apple.plist"
+	$(_v) $(INSTALL_FILE) "$(Sources)/conf/caldavd-apple.plist" "$(DSTROOT)$(SIPP)$(ETCDIR)$(CALDAVDSUBDIR)/caldavd.plist"
 	$(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)$(SIPP)$(ETCDIR)$(WEBAPPSSUBDIR)"
 	$(_v) $(INSTALL_FILE) "$(Sources)/contrib/migration/com.apple.webapp.contacts.plist" "$(DSTROOT)$(SIPP)$(ETCDIR)$(WEBAPPSSUBDIR)/com.apple.webapp.contacts.plist"
 	$(_v) $(INSTALL_FILE) "$(Sources)/contrib/migration/com.apple.webapp.contactsssl.plist" "$(DSTROOT)$(SIPP)$(ETCDIR)$(WEBAPPSSUBDIR)/com.apple.webapp.contactsssl.plist"

Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/stdconfig.py	2012-12-17 23:43:46 UTC (rev 10185)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py	2012-12-17 23:46:44 UTC (rev 10186)
@@ -41,7 +41,7 @@
 log = Logger()
 
 if platform.isMacOSX():
-    DEFAULT_CONFIG_FILE = "/Applications/Server.app/Contents/ServerRoot/private/etc/caldavd/caldavd-apple.plist"
+    DEFAULT_CONFIG_FILE = "/Library/Server/Calendar and Contacts/Config/caldavd.plist"
 else:
     DEFAULT_CONFIG_FILE = "/etc/caldavd/caldavd.plist"
 
@@ -1029,15 +1029,13 @@
             configDict = self._parseConfigFromFile(self._configFileName)
         # Now check for Includes and parse and add each of those
         if "Includes" in configDict:
+            configRoot = os.path.join(configDict.ServerRoot, configDict.ConfigRoot)
             for include in configDict.Includes:
-                path = _expandPath(fullServerPath(configDict.ConfigRoot, include))
-                if os.path.exists(path):
-                    additionalDict = self._parseConfigFromFile(path)
-                    if additionalDict:
-                        log.info("Adding configuration from file: '%s'" % (path,))
-                        configDict.update(additionalDict)
-                else:
-                    log.warn("Missing configuration file: '%s'" % (path,))
+                path = _expandPath(fullServerPath(configRoot, include))
+                additionalDict = self._parseConfigFromFile(path)
+                if additionalDict:
+                    log.info("Adding configuration from file: '%s'" % (path,))
+                    configDict.update(additionalDict)
         return configDict
 
 

Modified: CalendarServer/trunk/txdav/common/icommondatastore.py
===================================================================
--- CalendarServer/trunk/txdav/common/icommondatastore.py	2012-12-17 23:43:46 UTC (rev 10185)
+++ CalendarServer/trunk/txdav/common/icommondatastore.py	2012-12-17 23:46:44 UTC (rev 10186)
@@ -237,7 +237,7 @@
         @param guid: The GUID of the subscribed principal
         @type guid: C{str}
 
-        @return: tuples of (token, key, timestamp, userAgent, ipAddr)
+        @return: tuples of (token, key, timestamp)
         """
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20121217/4918be63/attachment.html>


More information about the calendarserver-changes mailing list