Merge branch 'master' into bugfixes

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

diff --git a/dak/dakdb/update3.py b/dak/dakdb/update3.py
index df89fb9d6300710e85ec890d51a830b25f8b3a76..ccd463c4bef3c4866f63ade9f1c9839be0e40a7f 100755 (executable)
--- a/dak/dakdb/update3.py
+++ b/dak/dakdb/update3.py
@@ -20,7 +20,9 @@
 
 ################################################################################
 
-import psycopg2, time
+import psycopg2
+import time
+from daklib.dak_exceptions import DBUpdateError
 
 ################################################################################
 
@@ -29,13 +31,16 @@ def do_update(self):
 
     try:
         c = self.db.cursor()
-        c.execute("DROP FUNCTION versioncmp(text, text);")
+        try:
+            # This might not exist on a fresh install, so don't fail
+            # needlessly
+            c.execute("DROP FUNCTION versioncmp(text, text);")
+        except:
+            pass
         c.execute("UPDATE config SET value = '3' WHERE name = 'db_revision'")
 
         self.db.commit()
 
     except psycopg2.ProgrammingError, msg:
         self.db.rollback()
-        print "FATAL: Unable to apply db update 3!"
-        print "Error Message: " + str(msg)
-        print "Database changes have been rolled back."
+        raise DBUpdateError, "Unable to appy versioncmp removal, rollback issued. Error message : %s" % (str(msg))