Merge branch 'master' into bugfixes

[dak.git] / dak / init_db.py

diff --git a/dak/init_db.py b/dak/init_db.py
index af0a03b2a3e32e32b3c125c4f4f9bc0d565c81e3..e15d7680799ab0dc0d69e24ebf5743cc249f3ba4 100755 (executable)
--- a/dak/init_db.py
+++ b/dak/init_db.py
@@ -23,8 +23,8 @@ import psycopg2, sys
 import apt_pkg
 
 from daklib import utils
-from daklib.DBConn import DBConn
-from daklib.Config import Config
+from daklib.dbconn import DBConn
+from daklib.config import Config
 
 ################################################################################
 
@@ -139,7 +139,7 @@ class InitDB(object):
             origin = sql_get(suite_config, "Origin")
             description = sql_get(suite_config, "Description")
             c.execute(suite_add, [suite.lower(), version, origin, description])
-            for architecture in self.Cnf.ValueList("Suite::%s::Architectures" % (suite)):
+            for architecture in self.Cnf.SubTree("Architectures").List():
                 architecture_id = self.projectB.get_architecture_id (architecture)
                 if architecture_id < 0:
                     utils.fubar("architecture '%s' not found in architecture"