cronekorkn/bundlewrap
1
0
Fork 0
Code Issues Pull requests 8 Projects Releases Wiki Activity

apt more unique sources lists

Browse source
This commit is contained in:
mwiegand 2022-06-23 00:26:51 +02:00
parent 72f560809b
commit d4738d762b
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
bundles/apt/items.py
View file

@ -48,8 +48,8 @@ hosts = {}
for source_string in node.metadata.get('apt/sources'): for source_string in node.metadata.get('apt/sources'):
source = repo.libs.apt.AptSource(source_string) source = repo.libs.apt.AptSource(source_string)
hosts\ hosts\
.setdefault(source.url.hostname, set())\ .setdefault(source.url.hostname, list())\
.add(source) .append(source)
# create sources lists and keyfiles # create sources lists and keyfiles
@ -61,12 +61,13 @@ for host, sources in hosts.items():
source.options['signed-by'] = [destination_path] source.options['signed-by'] = [destination_path]
files[f'/etc/apt/sources.list.d/{host}.list'] = { files[f'/etc/apt/sources.list.d/{host}.list'] = {
'content': '\n'.join( 'content': '\n'.join(set(
str(source) for source in sorted(sources) str(source).format(
).format( release=node.metadata.get('os_release'),
release=node.metadata.get('os_release'), version=node.os_version[0], # WIP crystal
version=node.os_version[0], # WIP crystal )
), for source in sorted(dict.fromkeys(sources))
)),
'triggers': { 'triggers': {
'action:apt_update', 'action:apt_update',
}, },