X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fdakdb%2Fupdate2.py;h=2e3cb446b55f1cedb985628f17524caa1520964b;hb=ec44bcc3b4bbeb7a389dda77f39ff54436d1b181;hp=12fe4f17ba691e412dbd1ee5852f753bec0fb35f;hpb=b155c08a04d9cf3c415b00b999e1e9a680735258;p=dak.git diff --git a/dak/dakdb/update2.py b/dak/dakdb/update2.py index 12fe4f17..2e3cb446 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 -# Copyright © 2008 Roger Leigh +""" +debversion + +@contact: Debian FTP Master +@copyright: 2008 Michael Casadevall +@copyright: 2008 Roger Leigh +@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 ################################################################################ @@ -36,6 +43,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 +398,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))