X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Frm.py;h=0a07ce6fbf96a9b43ea81f0d19f066d42150d2f1;hb=b56b4a2838abe0b7d48527c8ca0cc051666ec1e7;hp=8e410ceb68e1be367bae1d6a810f8183dda256d1;hpb=8eacd63f7c91d557537a5672e59a7ff854e159ff;p=dak.git

diff --git a/dak/rm.py b/dak/rm.py
index 8e410ceb..0a07ce6f 100755
--- a/dak/rm.py
+++ b/dak/rm.py
@@ -126,9 +126,14 @@ def reverse_depends_check(removals, suite, arches=None, session=None):
         params['arch_id'] = get_architecture(architecture, session).arch_id
 
         statement = '''
+            WITH suite_binaries AS
+                (select b.id, b.package, b.source, b.file
+                    from binaries b WHERE b.id in
+                        (SELECT bin FROM bin_associations WHERE suite = :suite_id)
+                        AND b.architecture in (:arch_id, :arch_all_id))
             SELECT b.id, b.package, s.source, c.name as component,
                 bmd.value as depends, bmp.value as provides
-                FROM binaries b
+                FROM suite_binaries b
                 LEFT OUTER JOIN binaries_metadata bmd
                     ON b.id = bmd.bin_id AND bmd.key_id = :metakey_d_id
                 LEFT OUTER JOIN binaries_metadata bmp
@@ -136,10 +141,8 @@ def reverse_depends_check(removals, suite, arches=None, session=None):
                 JOIN source s ON b.source = s.id
                 JOIN files f ON b.file = f.id
                 JOIN location l ON f.location = l.id
-                JOIN component c ON l.component = c.id
-                WHERE b.id in
-                    (SELECT bin FROM bin_associations WHERE suite = :suite_id)
-                    AND b.architecture in (:arch_id, :arch_all_id)'''
+                JOIN component c ON l.component = c.id'''
+        session.rollback()
         query = session.query('id', 'package', 'source', 'component', 'depends', 'provides'). \
             from_statement(statement).params(params)
         for binary_id, package, source, component, depends, provides in query: