[Checkins] SVN: Products.Five/branches/1.4/ Backport r72986 to 1.4 branch.

[Tim Terlegård]

Log message for revision 86876:
  Backport r72986 to 1.4 branch.
  

Changed:
  U   Products.Five/branches/1.4/CHANGES.txt
  U   Products.Five/branches/1.4/fiveconfigure.py
  U   Products.Five/branches/1.4/tests/test_pythonproducts.py

-=-
Modified: Products.Five/branches/1.4/CHANGES.txt
===================================================================
--- Products.Five/branches/1.4/CHANGES.txt	2008-05-21 12:09:54 UTC (rev 86875)
+++ Products.Five/branches/1.4/CHANGES.txt	2008-05-21 12:52:11 UTC (rev 86876)
@@ -2,6 +2,16 @@
 Five Changes
 ============
 
+Five 1.4.x (svn/unreleased)
+===========================
+
+Bugfixes
+--------
+
+* Backported r72986 from 1.5 branch to get rid of conflict errors
+  that happened during startup of zope.
+
+
 Five 1.4.4 (2006-07-31)
 =======================
 

Modified: Products.Five/branches/1.4/fiveconfigure.py
===================================================================
--- Products.Five/branches/1.4/fiveconfigure.py	2008-05-21 12:09:54 UTC (rev 86875)
+++ Products.Five/branches/1.4/fiveconfigure.py	2008-05-21 12:52:11 UTC (rev 86876)
@@ -265,7 +265,7 @@
     if not hasattr(module_, '__path__'):
         raise ValueError("Must be a package and the " \
                          "package must be filesystem based")
-    
+
     app = Zope2.app()
     try:
         product = initializeProduct(module_, 
@@ -278,6 +278,11 @@
         if initFunc is not None:
             newContext = ProductContext(product, app, module_)
             initFunc(newContext)
+
+        registered_packages = getattr(Products, '_registered_packages', None)
+        if registered_packages is None:
+            registered_packages = Products._registered_packages = []
+        registered_packages.append(module_)
     finally:
         try:
             import transaction

Modified: Products.Five/branches/1.4/tests/test_pythonproducts.py
===================================================================
--- Products.Five/branches/1.4/tests/test_pythonproducts.py	2008-05-21 12:09:54 UTC (rev 86875)
+++ Products.Five/branches/1.4/tests/test_pythonproducts.py	2008-05-21 12:52:11 UTC (rev 86876)
@@ -64,7 +64,11 @@
       >>> 'pythonproduct2' in product_listing
       True
 
+    Make sure it also shows up in ``Products._registered_packages``.
 
+      >>> [x.__name__ for x in getattr(Products, '_registered_packages', [])]
+      ['pythonproduct2']
+
     Clean up:
 
       >>> tearDown()