X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=dak%2Fdakdb%2Fupdate30.py;h=f68c74a34a5f7baaaeb5be8f59aa743ebfd6c777;hb=e2c4fd7f21c3b33cd7192bded5d6373e0ee90374;hp=d002c690be4e93816f69689a17f268dcac5a8500;hpb=c2b68923aa806fb243fbea563b84c776482100bc;p=dak.git diff --git a/dak/dakdb/update30.py b/dak/dakdb/update30.py index d002c690..f68c74a3 100644 --- a/dak/dakdb/update30.py +++ b/dak/dakdb/update30.py @@ -58,7 +58,7 @@ def do_update(self): JOIN section s on s.id=o.section WHERE b.id=$1 AND o.suite=$2 - AND o.type in ('deb','udeb') + AND ot.type in ('deb','udeb') \"\"\", ["int", "int"]), [TD["new"]["bin"], TD["new"]["suite"]])[0] @@ -95,6 +95,6 @@ $$ LANGUAGE plpythonu VOLATILE SECURITY DEFINER; c.execute("UPDATE config SET value = '30' WHERE name = 'db_revision'") self.db.commit() - except psycopg2.ProgrammingError, msg: + except psycopg2.ProgrammingError as msg: self.db.rollback() - raise DBUpdateError, "Unable to appy debversion updates, rollback issued. Error message : %s" % (str(msg)) + raise DBUpdateError("Unable to appy debversion updates, rollback issued. Error message : %s" % (str(msg)))