Merge remote branch 'ftpmaster/master' into override-cs-db

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

diff --git a/dak/dakdb/update7.py b/dak/dakdb/update7.py
index c8828535b021f29edcf23c979c42e9b2fc9bc146..9c3dd1ed6662f4faa8eb2ea5cb5f9515297f0c18 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
@@ -114,6 +116,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '7' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Unable to appy suite config updates, rollback issued. Error message : %s" % (str(msg))
+        raise DBUpdateError("Unable to appy suite config updates, rollback issued. Error message : %s" % (str(msg)))