Merge remote-tracking branch 'ansgar/pu/multiarchive-2'

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

diff --git a/dak/dakdb/update3.py b/dak/dakdb/update3.py
old mode 100755 (executable)
new mode 100644 (file)
index c91ecf5..f7a4e50
--- a/dak/dakdb/update3.py
+++ b/dak/dakdb/update3.py
@@ -36,11 +36,19 @@ def do_update(self):
 
     try:
         c = self.db.cursor()
-        c.execute("DROP FUNCTION versioncmp(text, text);")
+        # The reason we try and check to see if it exists is that
+        # psycopg2 might leave the cursor invalid if the drop fails
+        c.execute("SELECT proname from pg_catalog.pg_proc WHERE proname = 'versioncmp'")
+        rows = c.fetchall()
+        if rows:
+            c.execute("DROP FUNCTION versioncmp(text, text);")
+        else:
+            print "function already does not exist"
+
         c.execute("UPDATE config SET value = '3' WHERE name = 'db_revision'")
 
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Unable to appy versioncmp removal, rollback issued. Error message : %s" % (str(msg))
+        raise DBUpdateError("Unable to appy versioncmp removal, rollback issued. Error message : %s" % (str(msg)))