Merge remote-tracking branch 'mhy/override-cs-db' into merge

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

diff --git a/dak/dakdb/update4.py b/dak/dakdb/update4.py
index 8c55d09b219066407a0fba9d9255f9d73aca0aa5..938522ccd83cddacc7d9765cd360c2c6d034f1c5 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
@@ -66,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)))