]> git.decadent.org.uk Git - dak.git/commitdiff
dak/dakdb/update75.py: fix adding architectures for new and byhand
authorAnsgar Burchardt <ansgar@debian.org>
Sat, 11 Aug 2012 16:59:43 +0000 (18:59 +0200)
committerAnsgar Burchardt <ansgar@debian.org>
Sun, 12 Aug 2012 07:30:39 +0000 (09:30 +0200)
dak/dakdb/update75.py

index fb736a55857360873da17ed39d6ab58b6c3714c7..e66843374fee87158d1f2363eb386de8c7d1df35 100644 (file)
@@ -131,6 +131,7 @@ def _convert_policy_queues(cnf, c):
           FROM policy_queue pq
           JOIN suite ON pq.id = suite.policy_queue_id
           JOIN suite_architectures sa ON suite.id = sa.suite
+         WHERE pq.queue_name NOT IN ('byhand', 'new')
          GROUP BY pq.suite_id, sa.architecture""")
 
     # We only add architectures from suite_architectures to only add
@@ -139,8 +140,7 @@ def _convert_policy_queues(cnf, c):
     # to generate Packages indices.
     c.execute("""INSERT INTO suite_architectures (suite, architecture)
         SELECT DISTINCT pq.suite_id, sa.architecture
-          FROM build_queue bq
-          JOIN suite_architectures sa
+          FROM policy_queue pq, suite_architectures sa
          WHERE pq.queue_name IN ('byhand', 'new')""")
 
     c.execute("""CREATE TABLE policy_queue_upload (