Merge commit 'mhyftpmaster/master'

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

diff --git a/dak/dakdb/update7.py b/dak/dakdb/update7.py
index 96a3614612939808a68ae5f60579364dbe3221fa..6f91eb378d2dc1dd6c06fdcab87757508131a05c 100755 (executable)
--- a/dak/dakdb/update7.py
+++ b/dak/dakdb/update7.py
@@ -2,11 +2,13 @@
 # coding=utf8
 
 """
-Debian Archive Kit Database Update Script
-Copyright © 2008  Michael Casadevall <mcasadevall@debian.org>
-Copyright © 2009  Joerg Jaspert <joerg@debian.org>
+Moving suite config into DB
+
+@contact: Debian FTP Master <ftpmaster@debian.org>
+@copyright: 2008  Michael Casadevall <mcasadevall@debian.org>
+@copyright: 2009  Joerg Jaspert <joerg@debian.org>
+@license: GNU General Public License version 2 or later
 
-Debian Archive Kit Database Update Script 7
 """
 
 # This program is free software; you can redistribute it and/or modify
@@ -48,7 +50,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 +58,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))