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

* ansgar/pu/multiarchive-2:
  dak/generate_packages_sources2.py: also import Archive from daklib.dbconn
  dak/generate_packages_sources2.py: remove .all() when we need the query object

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

diff --git a/dak/generate_packages_sources2.py b/dak/generate_packages_sources2.py
index 0d78d2d0be1498ebbacc2deae90bbaea54f62a05..ff890377db47f2e8abea926cfa30b51a9d8de16a 100755 (executable)
--- a/dak/generate_packages_sources2.py
+++ b/dak/generate_packages_sources2.py
@@ -331,7 +331,7 @@ def main():
 
     logger = daklog.Logger('generate-packages-sources2')
 
-    from daklib.dbconn import Component, DBConn, get_suite, Suite
+    from daklib.dbconn import Component, DBConn, get_suite, Suite, Archive
     session = DBConn().session()
     session.execute("SELECT add_missing_description_md5()")
     session.commit()
@@ -346,7 +346,7 @@ def main():
                 print "I: Cannot find suite %s" % s
                 logger.log(['Cannot find suite %s' % s])
     else:
-        query = session.query(Suite).filter(Suite.untouchable == False).all()
+        query = session.query(Suite).filter(Suite.untouchable == False)
         if 'Archive' in Options:
             query = query.join(Suite.archive).filter(Archive.archive_name==Options['Archive'])
         suites = query.all()