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

diff --git a/dak/dakdb/update2.py b/dak/dakdb/update2.py
old mode 100644
new mode 100755
index bddf0a70..10407a9c
--- 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,17 +21,28 @@
 
 ################################################################################
 
-import psycopg2, time
+import psycopg2
+import time
+from daklib.dak_exceptions import DBUpdateError
 
 ################################################################################
 
 def do_update(self):
-    print "Note the PL/Perl (plperl) procedural language must be enabled first."
-    print "Run 'createlang plpgsql projectb' to add it."
+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."
 
 # Not present in all databases, maybe PL/Perl version-dependent?
@@ -378,12 +389,10 @@ $$
         c.execute("ALTER TABLE source ALTER COLUMN version TYPE debversion;")
         c.execute("ALTER TABLE binaries ALTER COLUMN version TYPE debversion;")
 
-        c.execute("UPDATE config SET value = '1' WHERE name = 'db_revision'")
+        c.execute("UPDATE config SET value = '2' WHERE name = 'db_revision'")
 
         self.db.commit()
 
     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))