Manage deb822 format and apt-key removal in trixie #1437
Conversation
|
Just to let know you I am working on, comments are welcome |
maisim
force-pushed
the
3.x_Manage_deb822_format_and_apt-key_removal_in_trixie
branch
from
863a9f1 to
5d70a6b
Compare
maisim
force-pushed
the
3.x_Manage_deb822_format_and_apt-key_removal_in_trixie
branch
from
5d70a6b to
5c4cebf
Compare
| @@ -1,13 +1,13 @@ | |||
| from __future__ import annotations | |||
|
|
|||
| import re | |||
| from typing import List | |||
There was a problem hiding this comment.
You don't actually need to import this, as it's deprecated. You should use list now as type annotation
| @@ -60,44 +60,176 @@ def parse_apt_repo(name): | |||
| } | |||
|
|
|||
|
|
|||
| class AptSources(FactBase): | |||
| def parse_deb822_stanza(lines: list[str]): | |||
There was a problem hiding this comment.
Add return type annotation.
| return repos | ||
|
|
||
|
|
||
| def parse_apt_list_file(lines: List[str]): |
There was a problem hiding this comment.
Add return type annotation, use list[str] for lines
| return repos | ||
|
|
||
|
|
||
| def parse_deb822_sources_file(lines: List[str]): |
There was a problem hiding this comment.
Add return type annotation, use list[str] for lines
| stanza. Returns a combined list of repo dicts for all stanzas. | ||
| """ | ||
| repos = [] | ||
| stanza: List[str] = [] |
There was a problem hiding this comment.
| stanza: List[str] = [] | |
| stanza: list[str] = [] |
| # then export and dearmor to the APT keyring destination. | ||
| yield ( | ||
| "sh -c 'set -e;" | ||
| " install -d -m 0755 /etc/apt/keyrings;" |
There was a problem hiding this comment.
Why not use a fact to check if that dir already exists and only emit a files.directory command if it doesn't?
|
Hey @maisim, I hope you don't mind me leaving some comments. I agreed with @Fizzadar to help him out a bit with reviewing PRs. This is great work! Support for the new DEB822-style apt sources and a replacement for I have a couple of general suggestions, and I'll leave it to @Fizzadar if he agrees:
|
WIP
3.xat this time)scripts/dev-test.sh)scripts/dev-lint.sh)