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

* ansgar/pu/multiarchive-2:
  daklib/contents.py: use filter() instead of filter_by()

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

diff --git a/daklib/contents.py b/daklib/contents.py
index aedeb83dff5d529ad0bcf5ee417147841ecd77f2..07734075ed4e4d779d221b08eb9799bc5d91d85b 100644 (file)
--- a/daklib/contents.py
+++ b/daklib/contents.py
@@ -301,7 +301,7 @@ class ContentsWriter(object):
         if len(component_names) > 0:
             component_query = component_query.filter(Component.component_name.in_(component_names))
         if not force:
-            suite_query = suite_query.filter_by(untouchable = False)
+            suite_query = suite_query.filter(Suite.untouchable == False)
         deb_id = get_override_type('deb', session).overridetype_id
         udeb_id = get_override_type('udeb', session).overridetype_id
         pool = Pool()