Merge branch 'master' into bugfixes

[dak.git] / dak / dakdb / update7.py

diff --git a/dak/dakdb/update7.py b/dak/dakdb/update7.py
index 96a3614612939808a68ae5f60579364dbe3221fa..c8828535b021f29edcf23c979c42e9b2fc9bc146 100755 (executable)
--- a/dak/dakdb/update7.py
+++ b/dak/dakdb/update7.py
@@ -48,7 +48,7 @@ def do_update(self):
         c.execute("ALTER TABLE suite ADD COLUMN untouchable BOOLEAN NOT NULL DEFAULT FALSE;")
         query = "UPDATE suite SET untouchable = TRUE WHERE suite_name = %s"  #: Update query
         for suite in Cnf.SubTree("Suite").List():
-            untouchable = Cnf.Find("Suite::%s::Announce" % (suite))
+            untouchable = Cnf.Find("Suite::%s::Untouchable" % (suite))
             if not untouchable:
                 continue
             print "[Untouchable] Processing suite %s" % (suite)
@@ -56,7 +56,7 @@ def do_update(self):
             c.execute(query, [suite])
 
 
-        c.execute("ALTER TABLE suite ADD COLUMN announce text DEFAULT NOT NULL 'debian-devel-changes@lists.debian.org';")
+        c.execute("ALTER TABLE suite ADD COLUMN announce text NOT NULL DEFAULT 'debian-devel-changes@lists.debian.org';")
         query = "UPDATE suite SET announce = %s WHERE suite_name = %s"  #: Update query
         for suite in Cnf.SubTree("Suite").List():
             announce_list = Cnf.Find("Suite::%s::Announce" % (suite))