X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fdakdb%2Fupdate20.py;h=0e8ac9d81d8f380b4eb116a2af977bb4696e28b8;hb=c9035a5de77db26ff734e89107deddf19d8da1f8;hp=f4e34cb96b56428791918a43642d4fa8f932e071;hpb=4bb08a11d2dcf16dfe48109bcfe749d0dccab7d9;p=dak.git

diff --git a/dak/dakdb/update20.py b/dak/dakdb/update20.py
old mode 100755
new mode 100644
index f4e34cb9..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
@@ -95,6 +95,6 @@ def do_update(self):
         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)))