[dak/master] Check broken dependencies for arch-all packages only once.
---
dak/rm.py | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/dak/rm.py b/dak/rm.py
index 6aa4101..b9d0a10 100755
--- a/dak/rm.py
+++ b/dak/rm.py
@@ -117,9 +117,8 @@ def reverse_depends_check(removals, suite, arches=None, session=None):
'suite_id': dbsuite.suite_id,
'metakey_d_id': metakey_d.key_id,
'metakey_p_id': metakey_p.key_id,
- 'arch_all_id' : get_architecture('all', session).arch_id,
}
- for architecture in all_arches:
+ for architecture in all_arches | set(['all']):
deps = {}
sources = {}
virtual_packages = {}
@@ -138,7 +137,7 @@ def reverse_depends_check(removals, suite, arches=None, session=None):
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.architecture IN (:arch_id, :arch_all_id)'''
+ WHERE b.architecture = :arch_id'''
query = session.query('id', 'package', 'source', 'component', 'depends', 'provides'). \
from_statement(statement).params(params)
for binary_id, package, source, component, depends, provides in query:
@@ -196,7 +195,7 @@ def reverse_depends_check(removals, suite, arches=None, session=None):
for source, bindict in sorted(all_broken.items()):
lines = []
for binary, arches in sorted(bindict.items()):
- if arches == all_arches:
+ if arches == all_arches or 'all' in arches:
lines.append(binary)
else:
lines.append('%s [%s]' % (binary, ' '.join(sorted(arches))))
--
1.7.2.5
Reply to: