merge from master

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

diff --git a/dak/dakdb/update2.py b/dak/dakdb/update2.py
index 0cf747e923a3786f80306e9e44ce50be2b846a46..10407a9c510ce7daa38405b1c165c014025b00be 100755 (executable)
--- a/dak/dakdb/update2.py
+++ b/dak/dakdb/update2.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # coding=utf8
 
-# Debian Archive Kit Database Update Script
+""" Database Update Script - debversion """
 # Copyright © 2008  Michael Casadevall <mcasadevall@debian.org>
 # Copyright © 2008  Roger Leigh <rleigh@debian.org>
 
@@ -21,7 +21,9 @@
 
 ################################################################################
 
-import psycopg2, time
+import psycopg2
+import time
+from daklib.dak_exceptions import DBUpdateError
 
 ################################################################################
 
@@ -393,6 +395,4 @@ $$
 
     except psycopg2.ProgrammingError, 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))