Convert exception handling to Python3 syntax.

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

diff --git a/dak/dakdb/update4.py b/dak/dakdb/update4.py
index 487b4792d94d0b709e5a6944177c42612032fa95..169653fa4397caa7f4fd9e89b67b873553c419f7 100755 (executable)
--- a/dak/dakdb/update4.py
+++ b/dak/dakdb/update4.py
@@ -1,12 +1,10 @@
 #!/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>
 @license: GNU General Public License version 2 or later
-
 """
 
 # This program is free software; you can redistribute it and/or modify
@@ -27,17 +25,18 @@ Database Update Script - Get suite_architectures table use sane values
 
 import psycopg2
 from daklib.dak_exceptions import DBUpdateError
+from daklib.utils import get_conf
 
 ################################################################################
 
 suites = {}  #: Cache of existing suites
 archs = {}   #: Cache of existing architectures
 
-
 def do_update(self):
     """ Execute the DB update """
 
     print "Lets make suite_architecture table use sane values"
+    Cnf = get_conf()
 
     query = "INSERT into suite_architectures (suite, architecture) VALUES (%s, %s)"  #: Update query
     try:
@@ -59,10 +58,12 @@ def do_update(self):
             architectures = Cnf.SubTree("Suite::" + suite).ValueList("Architectures")
             suite = suite.lower()
             for arch in architectures:
-                c.execute(query, suites[suite], archs[arch])
+                c.execute(query, [suites[suite], archs[arch]])
+
+        c.execute("UPDATE config SET value = '4' WHERE name = 'db_revision'")
 
         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))