X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fdakdb%2Fupdate22.py;h=dbd7ced6023c1d3bf77b7c225ca1a4e4361d8211;hb=e531ecdc04d1c9204ab001a3dac9eda2b6405338;hp=924e30784ad4a69d3a3a409cdb0db9c1b631e9a5;hpb=12ce63e57c3e6a352da9616c44642fcd8c66fb69;p=dak.git

diff --git a/dak/dakdb/update22.py b/dak/dakdb/update22.py
index 924e3078..dbd7ced6 100755
--- a/dak/dakdb/update22.py
+++ b/dak/dakdb/update22.py
@@ -56,9 +56,12 @@ def do_update(self):
 
         print "Adding policy_queue table"
         c.execute("""CREATE TABLE policy_queue (
-                            id          SERIAL PRIMARY KEY,
-                            queue_name  TEXT NOT NULL UNIQUE,
-                            path        TEXT NOT NULL)""")
+                            id           SERIAL PRIMARY KEY,
+                            queue_name   TEXT NOT NULL UNIQUE,
+                            path         TEXT NOT NULL,
+                            perms        CHAR(4) NOT NULL DEFAULT '0660' CHECK (perms SIMILAR TO '^[0-7][0-7][0-7][0-7]$'),
+                            change_perms CHAR(4) NOT NULL DEFAULT '0660' CHECK (change_perms SIMILAR TO '^[0-7][0-7][0-7][0-7]$')
+                            )""")
 
         print "Copying queues"
         queues = {}
@@ -66,7 +69,7 @@ def do_update(self):
 
         for q in c.fetchall():
             queues[q[0]] = q[1]
-            if q[1] in ['accepted', 'buildd']:
+            if q[1] in ['accepted', 'buildd', 'embargoed', 'unembargoed']:
                 # Move to build_queue_table
                 c.execute("""INSERT INTO build_queue (queue_name, path, copy_files)
                                    VALUES ('%s', '%s', '%s')""" % (q[1], q[2], q[3]))
@@ -204,6 +207,9 @@ def do_update(self):
         print "Getting rid of old queue table"
         c.execute("""DROP TABLE queue""")
 
+        print "Sorting out permission columns"
+        c.execute("""UPDATE policy_queue SET perms = '0664' WHERE queue_name IN ('proposedupdates', 'oldproposedupdates')""")
+
         print "Moving known_changes table"
         c.execute("""ALTER TABLE known_changes RENAME TO changes""")