merge from master

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

diff --git a/dak/dakdb/update2.py b/dak/dakdb/update2.py
index 71b43fa701ccd73caab555e9e878097ad4a15e24..10407a9c510ce7daa38405b1c165c014025b00be 100755 (executable)
--- a/dak/dakdb/update2.py
+++ b/dak/dakdb/update2.py
@@ -21,16 +21,20 @@
 
 ################################################################################
 
-import psycopg2, time
+import psycopg2
+import time
+from daklib.dak_exceptions import DBUpdateError
 
 ################################################################################
 
 def do_update(self):
+vvvvvvvvvvvvvvvvvvvv
     print "Note: to be able to enable the the PL/Perl (plperl) procedural language, we do"
     print "need postgresql-plperl-$postgres-version installed. Make sure that this is the"
     print "case before you continue. Interrupt if it isn't, sleeping 5 seconds now."
     print "(We need to be database superuser for this to work!)"
     time.sleep (5)
+^^^^^^^^^^^^^^^^^^^^
 
     try:
         c = self.db.cursor()
@@ -391,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))