use config.DATABASE in cases where 'db' was still hard-coded

- in instance when determining the backend
- during init after nuking the db it would create 'db'

Author: Ralf Schlatterbeck

roundup/admin.py

@@ -508,7 +508,7 @@ def do_initialise(self, tracker_home, args):
             tracker.nuke()
 
             # re-write the backend select file
-            init.write_select_db(tracker_home, backend)
+            init.write_select_db(tracker_home, backend, tracker.config.DATABASE)
 
         # GO
         tracker.init(password.Password(adminpw))

roundup/init.py

@@ -176,10 +176,12 @@ def saveTemplateInfo(dir, info):
     finally:
         f.close()
 
-def write_select_db(instance_home, backend):
+def write_select_db(instance_home, backend, dbdir = 'db'):
     ''' Write the file that selects the backend for the tracker
     '''
-    dbdir = os.path.join(instance_home, 'db')
+    # dbdir may be a relative pathname, os.path.join does the right
+    # thing when the second component of a join is an absolute path
+    dbdir = os.path.join (instance_home, dbdir)
     if not os.path.exists(dbdir):
         os.makedirs(dbdir)
     f = open(os.path.join(dbdir, 'backend_name'), 'w')

roundup/instance.py

@@ -81,7 +81,7 @@ def __init__(self, tracker_home, optimize=0):
 
     def get_backend_name(self):
         o = __builtins__['open']
-        f = o(os.path.join(self.tracker_home, 'db', 'backend_name'))
+        f = o(os.path.join(self.config.DATABASE, 'backend_name'))
         name = f.readline().strip()
         f.close()
         return name