Skip to content

Commit d3157f0

Browse files
committed
checks/profiles: sort USE and USE_EXPAND flags in output
For more reliable output (especially in gentoo CI) ensure that flags are always sorted in checks that report unknown USE or USE_EXPAND values. In many cases, the values were already sorted, this just moves the sorting into a central location to capture some missed spots. Signed-off-by: Thomas Bracht Laumann Jespersen <laumann@gentoo.org>
1 parent dd92755 commit d3157f0

1 file changed

Lines changed: 10 additions & 14 deletions

File tree

src/pkgcheck/checks/profiles.py

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def __init__(self, path, atom, flags):
7373
super().__init__()
7474
self.path = path
7575
self.atom = str(atom)
76-
self.flags = tuple(flags)
76+
self.flags = tuple(sorted(flags))
7777

7878
@property
7979
def desc(self):
@@ -89,7 +89,7 @@ class UnknownProfileUse(results.ProfilesResult, results.Warning):
8989
def __init__(self, path, flags):
9090
super().__init__()
9191
self.path = path
92-
self.flags = tuple(flags)
92+
self.flags = tuple(sorted(flags))
9393

9494
@property
9595
def desc(self):
@@ -121,7 +121,7 @@ def __init__(self, path: str, var: str, groups: Iterable[str]):
121121
super().__init__()
122122
self.path = path
123123
self.var = var
124-
self.groups = tuple(groups)
124+
self.groups = tuple(sorted(groups))
125125

126126
@property
127127
def desc(self):
@@ -137,7 +137,7 @@ def __init__(self, path: str, group: str, values: Iterable[str]):
137137
super().__init__()
138138
self.path = path
139139
self.group = group
140-
self.values = tuple(values)
140+
self.values = tuple(sorted(values))
141141

142142
@property
143143
def desc(self):
@@ -308,9 +308,9 @@ def _use(self, filename, node, vals):
308308
for _, disabled, enabled in entries:
309309
if unknown_disabled := set(disabled) - self.available_iuse:
310310
flags = ("-" + u for u in unknown_disabled)
311-
yield UnknownProfileUse(pjoin(node.name, filename), sorted(flags))
311+
yield UnknownProfileUse(pjoin(node.name, filename), flags)
312312
if unknown_enabled := set(enabled) - self.available_iuse:
313-
yield UnknownProfileUse(pjoin(node.name, filename), sorted(unknown_enabled))
313+
yield UnknownProfileUse(pjoin(node.name, filename), unknown_enabled)
314314

315315
@verify_files(
316316
("packages", "packages"),
@@ -376,7 +376,7 @@ def _make_defaults(self, filename: str, node: sources.ProfileNode, vals: dict[st
376376
for use in vals.get(use_group, "").split()
377377
}:
378378
if unknown := use_flags - self.available_iuse:
379-
yield UnknownProfileUse(pjoin(node.name, filename), sorted(unknown))
379+
yield UnknownProfileUse(pjoin(node.name, filename), unknown)
380380
implicit_use_expands = set(vals.get("USE_EXPAND_IMPLICIT", "").split())
381381
for use_group in (
382382
"USE_EXPAND",
@@ -385,24 +385,20 @@ def _make_defaults(self, filename: str, node: sources.ProfileNode, vals: dict[st
385385
):
386386
values = {use.removeprefix("-") for use in vals.get(use_group, "").split()}
387387
if unknown := values - self.use_expand_groups.keys() - implicit_use_expands:
388-
yield UnknownProfileUseExpand(
389-
pjoin(node.name, filename), use_group, sorted(unknown)
390-
)
388+
yield UnknownProfileUseExpand(pjoin(node.name, filename), use_group, unknown)
391389
for key, val in vals.items():
392390
if key.startswith("USE_EXPAND_VALUES_"):
393391
use_group = key[18:]
394392
if use_group in implicit_use_expands:
395393
continue
396394
elif allowed_values := self.use_expand_groups.get(use_group, None):
397395
if unknown := set(val.split()) - allowed_values:
398-
yield UnknownProfileUseExpandValue(
399-
pjoin(node.name, filename), key, sorted(unknown)
400-
)
396+
yield UnknownProfileUseExpandValue(pjoin(node.name, filename), key, unknown)
401397
else:
402398
yield UnknownProfileUseExpand(pjoin(node.name, filename), key, [use_group])
403399
for key in vals.keys() & self.use_expand_groups.keys():
404400
if unknown := set(vals.get(key, "").split()) - self.use_expand_groups[key]:
405-
yield UnknownProfileUseExpandValue(pjoin(node.name, filename), key, sorted(unknown))
401+
yield UnknownProfileUseExpandValue(pjoin(node.name, filename), key, unknown)
406402
if missing_values := {
407403
use_group
408404
for use_group in implicit_use_expands

0 commit comments

Comments
 (0)