Skip to content

checks/profiles: sort USE and USE_EXPAND flags in output #786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
laumann wants to merge 1 commit into from
+10 −14
Closed

checks/profiles: sort USE and USE_EXPAND flags in output #786

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 10 additions & 14 deletions src/pkgcheck/checks/profiles.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def __init__(self, path, atom, flags):
super().__init__()
self.path = path
self.atom = str(atom)
self.flags = tuple(flags)
self.flags = tuple(sorted(flags))

@property
def desc(self):
Expand All @@ -89,7 +89,7 @@ class UnknownProfileUse(results.ProfilesResult, results.Warning):
def __init__(self, path, flags):
super().__init__()
self.path = path
self.flags = tuple(flags)
self.flags = tuple(sorted(flags))

@property
def desc(self):
Expand Down Expand Up @@ -121,7 +121,7 @@ def __init__(self, path: str, var: str, groups: Iterable[str]):
super().__init__()
self.path = path
self.var = var
self.groups = tuple(groups)
self.groups = tuple(sorted(groups))

@property
def desc(self):
Expand All @@ -137,7 +137,7 @@ def __init__(self, path: str, group: str, values: Iterable[str]):
super().__init__()
self.path = path
self.group = group
self.values = tuple(values)
self.values = tuple(sorted(values))

@property
def desc(self):
Expand Down Expand Up @@ -308,9 +308,9 @@ def _use(self, filename, node, vals):
for _, disabled, enabled in entries:
if unknown_disabled := set(disabled) - self.available_iuse:
flags = ("-" + u for u in unknown_disabled)
yield UnknownProfileUse(pjoin(node.name, filename), sorted(flags))
yield UnknownProfileUse(pjoin(node.name, filename), flags)
if unknown_enabled := set(enabled) - self.available_iuse:
yield UnknownProfileUse(pjoin(node.name, filename), sorted(unknown_enabled))
yield UnknownProfileUse(pjoin(node.name, filename), unknown_enabled)

@verify_files(
("packages", "packages"),
Expand Down Expand Up @@ -376,7 +376,7 @@ def _make_defaults(self, filename: str, node: sources.ProfileNode, vals: dict[st
for use in vals.get(use_group, "").split()
}:
if unknown := use_flags - self.available_iuse:
yield UnknownProfileUse(pjoin(node.name, filename), sorted(unknown))
yield UnknownProfileUse(pjoin(node.name, filename), unknown)
implicit_use_expands = set(vals.get("USE_EXPAND_IMPLICIT", "").split())
for use_group in (
"USE_EXPAND",
Expand All @@ -385,24 +385,20 @@ def _make_defaults(self, filename: str, node: sources.ProfileNode, vals: dict[st
):
values = {use.removeprefix("-") for use in vals.get(use_group, "").split()}
if unknown := values - self.use_expand_groups.keys() - implicit_use_expands:
yield UnknownProfileUseExpand(
pjoin(node.name, filename), use_group, sorted(unknown)
)
yield UnknownProfileUseExpand(pjoin(node.name, filename), use_group, unknown)
for key, val in vals.items():
if key.startswith("USE_EXPAND_VALUES_"):
use_group = key[18:]
if use_group in implicit_use_expands:
continue
elif allowed_values := self.use_expand_groups.get(use_group, None):
if unknown := set(val.split()) - allowed_values:
yield UnknownProfileUseExpandValue(
pjoin(node.name, filename), key, sorted(unknown)
)
yield UnknownProfileUseExpandValue(pjoin(node.name, filename), key, unknown)
else:
yield UnknownProfileUseExpand(pjoin(node.name, filename), key, [use_group])
for key in vals.keys() & self.use_expand_groups.keys():
if unknown := set(vals.get(key, "").split()) - self.use_expand_groups[key]:
yield UnknownProfileUseExpandValue(pjoin(node.name, filename), key, sorted(unknown))
yield UnknownProfileUseExpandValue(pjoin(node.name, filename), key, unknown)
if missing_values := {
use_group
for use_group in implicit_use_expands
Expand Down
Loading