X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fdakdb%2Fupdate2.py;h=850e3ab550a5b2c993604d96fe862bf9cf1a0dcd;hb=890806b0d187db868c73af3df607a23d747eb1b6;hp=12fe4f17ba691e412dbd1ee5852f753bec0fb35f;hpb=b155c08a04d9cf3c415b00b999e1e9a680735258;p=dak.git diff --git a/dak/dakdb/update2.py b/dak/dakdb/update2.py index 12fe4f17..850e3ab5 100755 --- 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 # Copyright © 2008 Roger Leigh @@ -21,7 +21,9 @@ ################################################################################ -import psycopg2, time +import psycopg2 +import time +from daklib.dak_exceptions import DBUpdateError ################################################################################ @@ -36,6 +38,7 @@ def do_update(self): c = self.db.cursor() print "Enabling PL/Perl language" + c.execute("CREATE LANGUAGE plperl;") c.execute("CREATE LANGUAGE plpgsql;") print "Adding debversion type to database." @@ -390,6 +393,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))