Revision
3614
Author
wsanchez@apple.com
Date
2009-01-26 16:32:48 -0800 (Mon, 26 Jan 2009)

Log Message

raise ConfigurationError if a deprecated confic option and its replacement are both specified.

Modified Paths

Diff

Modified: CalendarServer/trunk/twistedcaldav/config.py (3613 => 3614)


--- CalendarServer/trunk/twistedcaldav/config.py	2009-01-27 00:32:44 UTC (rev 3613)
+++ CalendarServer/trunk/twistedcaldav/config.py	2009-01-27 00:32:48 UTC (rev 3614)
@@ -706,6 +706,11 @@
 
     def deprecated(oldKey, newKey):
         log.err("Configuration option %r is deprecated in favor of %r." % (oldKey, newKey))
+        if oldKey in configDict and newKey in configDict:
+            raise ConfigurationError(
+                "Both %r and %r options are specified; use the %r option only."
+                % (oldKey, newKey, newKey)
+            )
 
     def renamed(oldKey, newKey):
         deprecated(oldKey, newKey)