X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fdakdb%2Fupdate3.py;h=f7a4e5026e3c79908c208040f5a46d9ab273169c;hb=7ed15b809fd22f3325aed4e4a1ecac4387417437;hp=406cc89b3212a59ead022c4037f29663f2f46932;hpb=35cd0972b5e14dc8727403e13fccd30776f3ae02;p=dak.git

diff --git a/dak/dakdb/update3.py b/dak/dakdb/update3.py
old mode 100755
new mode 100644
index 406cc89b..f7a4e502
--- a/dak/dakdb/update3.py
+++ b/dak/dakdb/update3.py
@@ -36,16 +36,19 @@ def do_update(self):
 
     try:
         c = self.db.cursor()
-        try:
-            # This might not exist on a fresh install, so don't fail
-            # needlessly
+        # 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);")
-        except:
-            pass
+        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)))