Adjust to deal with the new Debian supplementaryGid

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

diff --git a/dak/dakdb/update75.py b/dak/dakdb/update75.py
index fb736a55857360873da17ed39d6ab58b6c3714c7..d152d6495a38eb411fcc4b48c51aed6336a2ae34 100644 (file)
--- a/dak/dakdb/update75.py
+++ b/dak/dakdb/update75.py
@@ -54,7 +54,7 @@ def _track_files_per_archive(cnf, c):
        FROM files f
        JOIN location l ON f.location = l.id""", (archive_id,))
 
-    c.execute("""UPDATE files f SET filename = substring(f.filename FROM '/(.*)')
+    c.execute("""UPDATE files f SET filename = substring(f.filename FROM c.name || '/(.*)')
       FROM location l, component c
       WHERE f.location = l.id AND l.component = c.id
         AND f.filename LIKE c.name || '/%'""")
@@ -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 (