[Zope-Checkins] CVS: Zope/lib/python/Zope/App - startup.py:1.8.2.1

[Chris McDonough]

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

Modified Files:
      Tag: Zope-2_7-branch
	startup.py 
Log Message:
Merge changes from HEAD since the release of Zope 2.7a1 into the Zope-2_7-branch in preparation for release of Zope 2.7b1.


=== Zope/lib/python/Zope/App/startup.py 1.8 => 1.8.2.1 ===
--- Zope/lib/python/Zope/App/startup.py:1.8	Tue Jun 24 17:31:31 2003
+++ Zope/lib/python/Zope/App/startup.py	Mon Jul 21 12:37:44 2003
@@ -52,10 +52,9 @@
         m=imp.find_module('custom_zodb',[getConfiguration().instancehome])
     except:
         # if there is no custom_zodb, use the config file specified databases
-        config = getConfiguration()
-        name = config.db_mount_tab['/']
-        DB = config.db_name_tab[name].open()
-        Globals.BobobaseName = name
+        configuration = getConfiguration()
+        DB = configuration.dbtab.getDatabase('/', is_root=1)
+        Globals.BobobaseName = DB.getName()
     else:
         m=imp.load_module('Zope.custom_zodb', m[0], m[1], m[2])
         if hasattr(m,'DB'):