[Zope-Checkins] CVS: Zope/lib/python/App - Product.py:1.63.2.2

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/App
In directory cvs.zope.org:/tmp/cvs-serv27517/lib/python/App

Modified Files:
      Tag: Zope-2_7-branch
	Product.py 
Log Message:
Disassociate zeo-client-name from enable-product-installation ZConfig keys.
In the past, if you ran an appserver as ZEO client with a persistent
cache, the startup logic prevented products from being loaded.  This
was a hack that got baked in via the weird interaction between the
FORCE_PRODUCT_LOAD and ZEO_CLIENT environment variables and was carried
over into Zope 2.7 by inertia.  Now they have nothing to do with each other
and can be specified independently.



=== Zope/lib/python/App/Product.py 1.63.2.1 => 1.63.2.2 ===
--- Zope/lib/python/App/Product.py:1.63.2.1	Mon Jul 21 12:35:11 2003
+++ Zope/lib/python/App/Product.py	Thu Oct  2 15:08:44 2003
@@ -591,7 +591,5 @@
 
 
 def doInstall():
-    if os.environ.has_key('FORCE_PRODUCT_LOAD'):
-        return not not os.environ['FORCE_PRODUCT_LOAD']
+    return getConfiguration().enable_product_installation
 
-    return not os.environ.get('ZEO_CLIENT')