Skip to content

Commit ffd742b

Browse files
committed
DeprecatedPkg: collapse some potential duplicate report cases
1 parent d690056 commit ffd742b

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

src/pkgcheck/checks/metadata.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -730,6 +730,7 @@ def feed(self, pkg):
730730

731731
outdated_blockers = set()
732732
nonexistent_blockers = set()
733+
deprecated = set()
733734

734735
for node in nodes:
735736
if isinstance(node, boolean.OrRestriction):
@@ -739,7 +740,7 @@ def feed(self, pkg):
739740

740741
for atom in iflatten_instance(node, (atom_cls,)):
741742
if self.deprecated(atom) and not self.masked(atom):
742-
yield DeprecatedPkg(attr.upper(), atom, pkg=pkg)
743+
deprecated.add(atom)
743744

744745
if in_or_restriction and atom.slot_operator == '=':
745746
yield BadDependency(
@@ -776,12 +777,14 @@ def feed(self, pkg):
776777
if years > 2:
777778
outdated_blockers.add((atom, years))
778779
else:
779-
nonexistent_blockers.add((atom))
780+
nonexistent_blockers.add(atom)
780781

781782
for atom, years in sorted(outdated_blockers):
782783
yield OutdatedBlocker(attr.upper(), str(atom), years, pkg=pkg)
783784
for atom in sorted(nonexistent_blockers):
784785
yield NonexistentBlocker(attr.upper(), str(atom), pkg=pkg)
786+
for atom in sorted(deprecated):
787+
yield DeprecatedPkg(attr.upper(), str(atom), pkg=pkg)
785788

786789

787790
class BadKeywords(results.VersionResult, results.Warning):

0 commit comments

Comments
 (0)