Commits:
-
f9f4483e
by Ansgar
at 2022-09-10T11:09:21+02:00
cruft-report: only look at components enabled for the suite
-
8177610a
by Ansgar
at 2022-09-10T11:33:54+02:00
rm.py: `--binary-version` and `--source-version` take an argument
-
25382c5b
by Ansgar
at 2022-09-10T12:03:08+02:00
contents: only write Contents for components enabled for the suite
3 changed files:
Changes:
dak/cruft_report.py
| ... |
... |
@@ -639,8 +639,8 @@ def main(): |
|
639
|
639
|
bins_in_suite = get_suite_binaries(suite, session)
|
|
640
|
640
|
|
|
641
|
641
|
# Checks based on the Sources files
|
|
642
|
|
- components = get_component_names(session)
|
|
643
|
|
- for component in components:
|
|
|
642
|
+ components = [c.component_name for c in suite.components]
|
|
|
643
|
+ for component in [c.component_name for c in suite.components]:
|
|
644
|
644
|
filename = "%s/dists/%s/%s/source/Sources" % (suite.archive.path, suite_name, component)
|
|
645
|
645
|
filename = utils.find_possibly_compressed_file(filename)
|
|
646
|
646
|
with apt_pkg.TagFile(filename) as Sources:
|
dak/rm.py
| ... |
... |
@@ -127,7 +127,7 @@ def main(): |
|
127
|
127
|
('a', "architecture", "Rm::Options::Architecture", "HasArg"),
|
|
128
|
128
|
('b', "binary", "Rm::Options::Binary"),
|
|
129
|
129
|
('B', "binary-only", "Rm::Options::Binary-Only"),
|
|
130
|
|
- ('\0', "binary-version", "Rm::Options::Binary-Version"),
|
|
|
130
|
+ ('\0', "binary-version", "Rm::Options::Binary-Version", "HasArg"),
|
|
131
|
131
|
('c', "component", "Rm::Options::Component", "HasArg"),
|
|
132
|
132
|
('C', "carbon-copy", "Rm::Options::Carbon-Copy", "HasArg"), # Bugs to Cc
|
|
133
|
133
|
('d', "done", "Rm::Options::Done", "HasArg"), # Bugs fixed
|
| ... |
... |
@@ -139,7 +139,7 @@ def main(): |
|
139
|
139
|
('p', "partial", "Rm::Options::Partial"),
|
|
140
|
140
|
('s', "suite", "Rm::Options::Suite", "HasArg"),
|
|
141
|
141
|
('S', "source-only", "Rm::Options::Source-Only"),
|
|
142
|
|
- ('\0', "source-version", "Rm::Options::Source-Version"),
|
|
|
142
|
+ ('\0', "source-version", "Rm::Options::Source-Version", "HasArg"),
|
|
143
|
143
|
]
|
|
144
|
144
|
|
|
145
|
145
|
for i in ['NoArchAllRdeps',
|
daklib/contents.py
| ... |
... |
@@ -296,6 +296,7 @@ class ContentsWriter: |
|
296
|
296
|
component_query = session.query(Component)
|
|
297
|
297
|
if component_names:
|
|
298
|
298
|
component_query = component_query.filter(Component.component_name.in_(component_names))
|
|
|
299
|
+ components = component_query.all()
|
|
299
|
300
|
if not force:
|
|
300
|
301
|
suite_query = suite_query.filter(Suite.untouchable == False) # noqa:E712
|
|
301
|
302
|
deb_id = get_override_type('deb', session).overridetype_id
|
| ... |
... |
@@ -312,7 +313,7 @@ class ContentsWriter: |
|
312
|
313
|
if suite.separate_contents_architecture_all:
|
|
313
|
314
|
skip_arch_all = False
|
|
314
|
315
|
|
|
315
|
|
- for component in component_query:
|
|
|
316
|
+ for component in (c for c in suite.components if c in components):
|
|
316
|
317
|
component_id = component.component_id
|
|
317
|
318
|
# handle source packages
|
|
318
|
319
|
pool.apply_async(source_helper, (suite_id, component_id),
|
|