X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fdakdb%2Fupdate3.py;h=f7a4e5026e3c79908c208040f5a46d9ab273169c;hb=772655d608069f12e400e0d6c7b7fac76eb98083;hp=ccd463c4bef3c4866f63ade9f1c9839be0e40a7f;hpb=3670b5f49b4d70a8eaf7ac24f50a541c9286fde2;p=dak.git diff --git a/dak/dakdb/update3.py b/dak/dakdb/update3.py old mode 100755 new mode 100644 index ccd463c4..f7a4e502 --- a/dak/dakdb/update3.py +++ b/dak/dakdb/update3.py @@ -1,8 +1,13 @@ #!/usr/bin/env python -""" Database Update Script - Remove unused versioncmp """ -# Copyright (C) 2008 Michael Casadevall -# Copyright (C) 2009 Joerg Jaspert +""" +Remove unused versioncmp + +@contact: Debian FTP Master +@copyright: 2008 Michael Casadevall +@copyright: 2009 Joerg Jaspert +@license: GNU General Public License version 2 or later +""" # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -31,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)))