X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Finit_db.py;h=169f30057cb1d91ff94881057926f8dc4a0dbcb9;hb=01496fe710b21e3922ef7b6f3ffa74f2b697b34d;hp=a3aba3bff0b2cabe60f4bd26905f214aafacbb94;hpb=ec5a92c9ab0ac854c3332ec77f00a1a889b7d12d;p=dak.git

diff --git a/dak/init_db.py b/dak/init_db.py
index a3aba3bf..169f3005 100755
--- a/dak/init_db.py
+++ b/dak/init_db.py
@@ -23,7 +23,7 @@ import sys
 import apt_pkg
 
 from daklib import utils
-from daklib.dbconn import DBConn, Archive, Architecture, Component, Location, Suite, SuiteArchitecture, OverrideType, Priority, Section
+from daklib.dbconn import *
 from daklib.config import Config
 
 ################################################################################
@@ -127,13 +127,15 @@ class InitDB(object):
         s.commit()
 
     def do_suite(self):
-        """Initalize the suite table."""
+        """Initialize the suite table."""
 
         s = self.projectB.session()
         s.query(Suite).delete()
 
         for suite in self.Cnf.SubTree("Suite").List():
+            suite = suite.lower()
             su = Suite()
+            su.suite_name  = suite
             su.version     = self.Cnf.get("Suite::%s::Version" % suite, "-")
             su.origin      = self.Cnf.get("Suite::%s::Origin" % suite, "")
             su.description = self.Cnf.get("Suite::%s::Description" % suite, "")
@@ -141,11 +143,11 @@ class InitDB(object):
 
             for architecture in self.Cnf.ValueList("Suite::%s::Architectures" % (suite)):
                 sa = SuiteArchitecture()
-                sa.suite_id = su.suite_id
                 a = s.query(Architecture).filter_by(arch_string=architecture)
                 if a.count() < 1:
                     utils.fubar("E: Architecture %s not found for suite %s" % (architecture, suite))
                 sa.arch_id = a.one().arch_id
+                sa.suite_id = su.suite_id
                 s.add(sa)
 
         s.commit()
@@ -172,7 +174,7 @@ class InitDB(object):
         for priority in self.Cnf.SubTree("Priority").List():
             p = Priority()
             p.priority = priority
-            p.level    = self.Cnf.get("Priority::%s", 0)
+            p.level    = self.Cnf.get("Priority::" + priority, "0")
             s.add(p)
 
         s.commit()