Merge remote branch 'stew/contents' into merge

* stew/contents:
  limit the query in 'update-content-for-bin_a' to only look for deb,udeb

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/dak/dakdb/update30.py b/dak/dakdb/update30.py
index 2cba65897372fb174f2f75bedb166dd0bca07200..d002c690be4e93816f69689a17f268dcac5a8500 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 o.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