X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fdakdb%2Fupdate2.py;h=9ad0da5d573cacc5b4e166a20d109e203c87b8dc;hb=27e00376e81d1c37ff327ee0d39670b266418869;hp=20154b07e007ef636d6fd5cde8713cbaf48c65c3;hpb=9c4a942a804b2b6ed99e54222c1b400fdf14d2cb;p=dak.git

diff --git a/dak/dakdb/update2.py b/dak/dakdb/update2.py
index 20154b07..9ad0da5d 100755
--- a/dak/dakdb/update2.py
+++ b/dak/dakdb/update2.py
@@ -1,9 +1,14 @@
 #!/usr/bin/env python
 # coding=utf8
 
-# Debian Archive Kit Database Update Script
-# Copyright © 2008  Michael Casadevall <mcasadevall@debian.org>
-# Copyright © 2008  Roger Leigh <rleigh@debian.org>
+"""
+debversion
+
+@contact: Debian FTP Master <ftpmaster@debian.org>
+@copyright: 2008  Michael Casadevall <mcasadevall@debian.org>
+@copyright: 2008  Roger Leigh <rleigh@debian.org>
+@license: GNU General Public License version 2 or later
+"""
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,7 +26,9 @@
 
 ################################################################################
 
-import psycopg2, time
+import psycopg2
+import time
+from daklib.dak_exceptions import DBUpdateError
 
 ################################################################################
 
@@ -389,8 +396,6 @@ $$
 
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        print "FATAL: Unable to apply debversion table update 2!"
-        print "Error Message: " + str(msg)
-        print "Database changes have been rolled back."
+        raise DBUpdateError, "Unable to appy debversion updates, rollback issued. Error message : %s" % (str(msg))