Merge remote-tracking branch 'ansgar/pu/multiarchive-1' into merge

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

diff --git a/dak/dakdb/update4.py b/dak/dakdb/update4.py
old mode 100644 (file)
new mode 100755 (executable)
index 1a9d9c3..a6456be
--- a/dak/dakdb/update4.py
+++ b/dak/dakdb/update4.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 """
-Database Update Script - Get suite_architectures table use sane values
+Get suite_architectures table use sane values
 
 @contact: Debian FTP Master <ftpmaster@debian.org>
 @copyright: 2009  Joerg Jaspert <joerg@debian.org>
@@ -53,9 +53,9 @@ def do_update(self):
         for suite in s:
             suites[suite[1]]=suite[0]
 
-        for suite in Cnf.SubTree("Suite").List():
+        for suite in Cnf.subtree("Suite").list():
             print "Processing suite %s" % (suite)
-            architectures = Cnf.SubTree("Suite::" + suite).ValueList("Architectures")
+            architectures = Cnf.subtree("Suite::" + suite).value_list("Architectures")
             suite = suite.lower()
             for arch in architectures:
                 c.execute(query, [suites[suite], archs[arch]])
@@ -64,6 +64,6 @@ def do_update(self):
 
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Unable to apply sanity to suite_architecture table, rollback issued. Error message : %s" % (str(msg))
+        raise DBUpdateError("Unable to apply sanity to suite_architecture table, rollback issued. Error message : %s" % (str(msg)))