[Checkins] SVN: Products.GenericSetup/trunk/Products/GenericSetup/configure.zcml - avoid conflict with five.formlib

Yvo Schubbe y.2011 at wcm-solutions.de
Tue Mar 1 03:58:26 EST 2011


Log message for revision 120620:
  - avoid conflict with five.formlib

Changed:
  U   Products.GenericSetup/trunk/Products/GenericSetup/configure.zcml

-=-
Modified: Products.GenericSetup/trunk/Products/GenericSetup/configure.zcml
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/configure.zcml	2011-03-01 08:38:56 UTC (rev 120619)
+++ Products.GenericSetup/trunk/Products/GenericSetup/configure.zcml	2011-03-01 08:58:26 UTC (rev 120620)
@@ -1,9 +1,13 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
     xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
+    xmlns:zcml="http://namespaces.zope.org/zcml"
     i18n_domain="genericsetup">
 
-  <include package="zope.formlib" />
+  <include
+      zcml:condition="not-installed five.formlib"
+      package="zope.formlib"
+      />
 
   <include package=".browser"/>
 



More information about the checkins mailing list