merge from master

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

diff --git a/dak/dakdb/update3.py b/dak/dakdb/update3.py
index cc297863ccafcccab7a12e26e966a03b1babcd9a..eef7d4c6a003ade245a2afc2bc7a49054f64ba40 100755 (executable)
--- a/dak/dakdb/update3.py
+++ b/dak/dakdb/update3.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Debian Archive Kit Database Update Script
+""" Database Update Script - Remove unused versioncmp """
 # Copyright (C) 2008  Michael Casadevall <mcasadevall@debian.org>
 # Copyright (C) 2009  Joerg Jaspert <joerg@debian.org>
 
@@ -20,7 +20,9 @@
 
 ################################################################################
 
-import psycopg2, time
+import psycopg2
+import time
+from daklib.dak_exceptions import DBUpdateError
 
 ################################################################################
 
@@ -36,6 +38,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError, msg:
         self.db.rollback()
-        print "FATAL: Unable to apply db update 3!"
-        print "Error Message: " + str(msg)
-        print "Database changes have been rolled back."
+        raise DBUpdateError, "Unable to appy versioncmp removal, rollback issued. Error message : %s" % (str(msg))