X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fdakdb%2Fupdate2.py;h=10407a9c510ce7daa38405b1c165c014025b00be;hb=9f371390bb90395b2f2f0b65c91c21047896774a;hp=12fe4f17ba691e412dbd1ee5852f753bec0fb35f;hpb=b155c08a04d9cf3c415b00b999e1e9a680735258;p=dak.git

diff --git a/dak/dakdb/update2.py b/dak/dakdb/update2.py
index 12fe4f17..10407a9c 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 <mcasadevall@debian.org>
 # Copyright © 2008  Roger Leigh <rleigh@debian.org>
 
@@ -21,21 +21,26 @@
 
 ################################################################################
 
-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()
 
         print "Enabling PL/Perl language"
+        c.execute("CREATE LANGUAGE plperl;")
         c.execute("CREATE LANGUAGE plpgsql;")
 
         print "Adding debversion type to database."
@@ -390,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))