Merge remote-tracking branch 'ansgar/pu/multiarchive-2' into merge

[dak.git] / dak / dakdb / update30.py

diff --git a/dak/dakdb/update30.py b/dak/dakdb/update30.py
index 2cba65897372fb174f2f75bedb166dd0bca07200..f68c74a34a5f7baaaeb5be8f59aa743ebfd6c777 100644 (file)
--- a/dak/dakdb/update30.py
+++ b/dak/dakdb/update30.py
@@ -58,13 +58,11 @@ def do_update(self):
             JOIN section s on s.id=o.section
             WHERE b.id=$1
             AND o.suite=$2
+            AND ot.type in ('deb','udeb')
             \"\"\",
             ["int", "int"]),
             [TD["new"]["bin"], TD["new"]["suite"]])[0]
 
-       if content_data['type'] not in ['deb', 'udeb']:
-           return
-
        tablename="%s_contents" % content_data['type']
 
        plpy.execute(plpy.prepare(\"\"\"DELETE FROM %s
@@ -97,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)))