[Zope3-checkins] SVN: Zope3/trunk/ zope.app.server.main.debug now loads product_config from zope.conf.

[Michael Howitz]

Log message for revision 74704:
  zope.app.server.main.debug now loads product_config from zope.conf.

Changed:
  U   Zope3/trunk/doc/CHANGES.txt
  U   Zope3/trunk/src/zope/app/server/main.py

-=-
Modified: Zope3/trunk/doc/CHANGES.txt
===================================================================
--- Zope3/trunk/doc/CHANGES.txt	2007-04-24 14:10:26 UTC (rev 74703)
+++ Zope3/trunk/doc/CHANGES.txt	2007-04-24 14:45:32 UTC (rev 74704)
@@ -30,7 +30,9 @@
       - #99402: zope.app.component.vocabulary.UtilityNameTerm was implement
         the wrong interface incorrectly
 
+      - zope.app.server.main.debug now loads product_config from zope.conf.
 
+
   ------------------------------------------------------------------
 
   Zope 3.4.0a1 (2007/04/19)

Modified: Zope3/trunk/src/zope/app/server/main.py
===================================================================
--- Zope3/trunk/src/zope/app/server/main.py	2007-04-24 14:10:26 UTC (rev 74703)
+++ Zope3/trunk/src/zope/app/server/main.py	2007-04-24 14:45:32 UTC (rev 74704)
@@ -65,6 +65,9 @@
 def debug(args=None):
     options = load_options(args)
 
+    zope.app.appsetup.product.setProductConfigurations(
+        options.product_config)
+
     zope.app.appsetup.config(options.site_definition)
 
     db = zope.app.appsetup.appsetup.multi_database(options.databases)[0][0]