[Erp5-report] r44536 kazuhiko - /erp5/trunk/software_release/erp5/software.cfg

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Wed Mar 23 15:15:56 2011
New Revision: 44536

URL: http://svn.erp5.org?rev=44536&view=rev
Log:
erp5.conflictresolver should not be included in Zope (Zeo) instance eggs.

Modified:
    erp5/trunk/software_release/erp5/software.cfg

Modified: erp5/trunk/software_release/erp5/software.cfg
URL: http://svn.erp5.org/erp5/trunk/software_release/erp5/software.cfg?rev=44536&r1=44535&r2=44536&view=diff
==============================================================================
--- erp5/trunk/software_release/erp5/software.cfg [utf8] (original)
+++ erp5/trunk/software_release/erp5/software.cfg [utf8] Wed Mar 23 15:15:56 2011
@@ -230,6 +230,7 @@ python = python2.6
 eggs =
 # instantiation egg
   ${instance-recipe:name}
+  erp5.conflictresolver
 
 [eggs]
 recipe = zc.recipe.egg
@@ -293,7 +294,6 @@ eggs =
 #    Products.PortalTransforms
 # Dependency for our fork of PortalTransforms
   StructuredText
-  erp5.conflictresolver
 
 # parameterizing the version of the generated python interpreter name by the
 # python section version causes dependency between this egg section and the