mirror of
https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu
synced 2025-06-05 14:51:37 +00:00
Rewrite write_controlfiles to take a single suite as argument
Signed-off-by: Niels Thykier <niels@thykier.net>
This commit is contained in:
parent
97d707e5c0
commit
4a2fe3420a
@ -2577,8 +2577,7 @@ class Britney(object):
|
|||||||
if self.options.control_files:
|
if self.options.control_files:
|
||||||
self.logger.info("Writing new control files for the target suite to %s",
|
self.logger.info("Writing new control files for the target suite to %s",
|
||||||
target_suite.path)
|
target_suite.path)
|
||||||
write_controlfiles(self.sources, self.binaries,
|
write_controlfiles(target_suite)
|
||||||
target_suite.name, target_suite.path)
|
|
||||||
|
|
||||||
for policy in self.policies:
|
for policy in self.policies:
|
||||||
policy.save_state(self)
|
policy.save_state(self)
|
||||||
|
@ -421,7 +421,7 @@ def relation_atom_to_string(atom):
|
|||||||
return pkg
|
return pkg
|
||||||
|
|
||||||
|
|
||||||
def write_controlfiles(sources, packages, suite, basedir):
|
def write_controlfiles(target_suite):
|
||||||
"""Write the control files
|
"""Write the control files
|
||||||
|
|
||||||
This method writes the control files for the binary packages of all
|
This method writes the control files for the binary packages of all
|
||||||
@ -430,8 +430,9 @@ def write_controlfiles(sources, packages, suite, basedir):
|
|||||||
these files may omit a lot of regular fields.
|
these files may omit a lot of regular fields.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
sources_s = sources[suite]
|
basedir = target_suite.path
|
||||||
packages_s = packages[suite]
|
sources_s = target_suite.sources
|
||||||
|
packages_s = target_suite.binaries
|
||||||
|
|
||||||
key_pairs = ((SECTION, 'Section'), (ARCHITECTURE, 'Architecture'),
|
key_pairs = ((SECTION, 'Section'), (ARCHITECTURE, 'Architecture'),
|
||||||
(MULTIARCH, 'Multi-Arch'), (SOURCE, 'Source'),
|
(MULTIARCH, 'Multi-Arch'), (SOURCE, 'Source'),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user