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

diff --git a/dak/dakdb/update3.py b/dak/dakdb/update3.py
index 406cc89b..5a5562fb 100755
--- a/dak/dakdb/update3.py
+++ b/dak/dakdb/update3.py
@@ -36,12 +36,15 @@ 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()