X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fdakdb%2Fupdate16.py;h=6cd6dc4b1b7af19566cc26901e77588f6402a288;hb=def19b9342c0db470b0454813d57bf2c2d6b5fb9;hp=36dd964eaaf413e0decd9c982832e5b7527e0267;hpb=0da83c6c07c369ad59dcf03a9ff7321b93190c9e;p=dak.git

diff --git a/dak/dakdb/update16.py b/dak/dakdb/update16.py
old mode 100755
new mode 100644
index 36dd964e..6cd6dc4b
--- a/dak/dakdb/update16.py
+++ b/dak/dakdb/update16.py
@@ -133,6 +133,8 @@ def do_update(self):
         c.execute("ALTER TABLE keyrings ADD COLUMN default_binary_reject BOOLEAN NOT NULL DEFAULT TRUE")
         # Set up keyring priorities
         c.execute("ALTER TABLE keyrings ADD COLUMN priority INT4 NOT NULL DEFAULT 100")
+        # And then we don't need the DM stuff any more
+        c.execute("ALTER TABLE keyrings DROP COLUMN debian_maintainer")
 
         # Default ACLs for keyrings
         c.execute("""
@@ -171,6 +173,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '16' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Unable to apply ACLs update (16), rollback issued. Error message : %s" % (str(msg))
+        raise DBUpdateError("Unable to apply ACLs update (16), rollback issued. Error message : %s" % (str(msg)))