X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fdakdb%2Fupdate20.py;h=0e8ac9d81d8f380b4eb116a2af977bb4696e28b8;hb=595c6c300a32bdc231f78725ba0c093c5f4c9c6b;hp=27df549b84911740112cc41cae8a7e6d0287ae91;hpb=6021a91078574c97968d076c0320182a20c33649;p=dak.git

diff --git a/dak/dakdb/update20.py b/dak/dakdb/update20.py
old mode 100755
new mode 100644
index 27df549b..0e8ac9d8
--- a/dak/dakdb/update20.py
+++ b/dak/dakdb/update20.py
@@ -59,7 +59,7 @@ def do_update(self):
             c.execute("UPDATE queue SET path = %s WHERE id = %s", (dir, row[0]))
 
         print "Adding missing queues to the queue table"
-        for q in cnf.SubTree("Dir::Queue").keys():
+        for q in cnf.subtree("Dir::Queue").keys():
             qname = q.lower()
             if qname in seenqueues.keys():
                 continue
@@ -84,17 +84,17 @@ def do_update(self):
         c.execute("ALTER TABLE suite ADD COLUMN policy_queue_id INT4 REFERENCES queue(id) DEFAULT NULL")
         # Handle some of our common cases automatically
         if seenqueues.has_key('proposedupdates'):
-            c.execute("""UPDATE suite SET policy_queue = (SELECT id FROM queue WHERE queue_name = 'proposedupdates')
+            c.execute("""UPDATE suite SET policy_queue_id = (SELECT id FROM queue WHERE queue_name = 'proposedupdates')
                                       WHERE suite_name = 'proposed-updates'""")
 
         if seenqueues.has_key('oldproposedupdates'):
-            c.execute("""UPDATE suite SET policy_queue = (SELECT id FROM queue WHERE queue_name = 'oldproposedupdates')
+            c.execute("""UPDATE suite SET policy_queue_id = (SELECT id FROM queue WHERE queue_name = 'oldproposedupdates')
                                       WHERE suite_name = 'oldstable-proposed-updates'""")
 
         print "Committing"
         c.execute("UPDATE config SET value = '20' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.InternalError, msg:
+    except psycopg2.InternalError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Unable to apply debversion update 20, rollback issued. Error message : %s" % (str(msg))
+        raise DBUpdateError("Unable to apply debversion update 20, rollback issued. Error message : %s" % (str(msg)))