[Zope-Checkins] CVS: Zope/inst - custom_zodb.py.in:1.1.2.6

[Chris McDonough]

Update of /cvs-repository/Zope/inst
In directory cvs.zope.org:/tmp/cvs-serv26453

Modified Files:
      Tag: chrism-install-branch
	custom_zodb.py.in 
Log Message:
Fix several typo-related bugs involving ZEO.


=== Zope/inst/custom_zodb.py.in 1.1.2.5 => 1.1.2.6 ===
--- Zope/inst/custom_zodb.py.in:1.1.2.5	Tue Sep 10 17:55:00 2002
+++ Zope/inst/custom_zodb.py.in	Wed Sep 11 00:10:00 2002
@@ -22,6 +22,7 @@
 import warnings, traceback
 import sys, os
 import zLOG
+import ZODB
 from Controller.Directives import DirectiveRegistry as reg
 
 CLIENT_HOME = reg['client_home']
@@ -29,8 +30,8 @@
 if reg['use_zeo_server']:
     port         = None
     path         = None
-    hostname     = reg['zeo_storage_server_name']
-    port_or_path = reg['zeo_storage_server_port']
+    hostname     = reg['zeo_storage_server_hostname']
+    port_or_path = reg['zeo_storage_server_path_or_port']
     storage_name = reg['zeo_storage_server_storagename'] or '1'
     cache_size   = reg['zeo_client_cache_size'] or 200000000
     debug        = reg['zeo_client_debug'] or 0
@@ -64,10 +65,10 @@
         sys.exit(255)
 
 else:
-    import ZODB.FileStorage
+    from ZODB import FileStorage
     default = os.path.join(CLIENT_HOME, 'Data.fs')
     filename = reg['zodb_filestorage_filepath'] or default
-    Storage = ZODB.FileStorage.FileStorage(filename)
+    Storage = FileStorage.FileStorage(filename)
 
 # use environment to try to get cache size and pool size
 # parameters