[CalendarServer-changes] [3466] CalendarServer/trunk

source_changes at macosforge.org source_changes at macosforge.org
Fri Dec 5 12:10:28 PST 2008


Revision: 3466
          http://trac.macosforge.org/projects/calendarserver/changeset/3466
Author:   wsanchez at apple.com
Date:     2008-12-05 12:10:28 -0800 (Fri, 05 Dec 2008)
Log Message:
-----------
and != as

Modified Paths:
--------------
    CalendarServer/trunk/support/Makefile.Apple
    CalendarServer/trunk/twistedcaldav/admin/formatters.py

Modified: CalendarServer/trunk/support/Makefile.Apple
===================================================================
--- CalendarServer/trunk/support/Makefile.Apple	2008-12-05 19:32:17 UTC (rev 3465)
+++ CalendarServer/trunk/support/Makefile.Apple	2008-12-05 20:10:28 UTC (rev 3466)
@@ -87,7 +87,8 @@
 	$(_v) cd $(BuildDirectory)/Twisted && $(TwistedSubEnvironment) $(PYTHON) twisted/web2/topfiles/setup.py   install $(PY_INSTALL_FLAGS)
 	$(_v) cd $(BuildDirectory)/Twisted && $(TwistedSubEnvironment) $(PYTHON) twisted/words/topfiles/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) for f in $$(find "$(DSTROOT)$(PY_HOME)/lib/python/twisted/plugins/" -type f ! -name 'caldav.*' ! -name 'twisted_reactors.*' ! -name 'twisted_trial.*' ! -name '__init__.*' ! -name 'kqueuereactor.*'); do rm "$${f}"; done
+	$(_v) echo "Removing plugins:"
+	$(_v) find "$(DSTROOT)$(PY_HOME)/lib/python/twisted/plugins/" -type f ! -name 'caldav.*' ! -name 'twisted_reactors.*' ! -name 'twisted_trial.*' ! -name '__init__.*' ! -name 'kqueuereactor.*' -print -exec rm '{}' ';'
 	$(_v) rm -fr "$(DSTROOT)$(PY_HOME)/lib/python/twisted/python/zsh"
 	$(_v) rm -f  "$(DSTROOT)$(PY_HOME)/lib/python/twisted/python/zshcomp.py"
 	$(_v) rm -f  "$(DSTROOT)$(PY_HOME)/lib/python/twisted/python/zshcomp.py"

Modified: CalendarServer/trunk/twistedcaldav/admin/formatters.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/admin/formatters.py	2008-12-05 19:32:17 UTC (rev 3465)
+++ CalendarServer/trunk/twistedcaldav/admin/formatters.py	2008-12-05 20:10:28 UTC (rev 3466)
@@ -16,7 +16,7 @@
 
 import sys
 
-from twext.python.plistlib import Dict and PlistDict, writePlist
+from twext.python.plistlib import Dict as PlistDict, writePlist
 
 FORMATTERS = {}
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081205/5c8725f0/attachment.html>


More information about the calendarserver-changes mailing list