Skip to content

Commit 4776408

Browse files
committed
DeprecatedDep: fix mishandling of slotted deprecates
Resolves: #642 Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
1 parent 4bda26a commit 4776408

7 files changed

Lines changed: 11 additions & 10 deletions

File tree

src/pkgcheck/checks/metadata.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -942,7 +942,7 @@ def feed(self, pkg):
942942
if not atom.blocks and self.deprecated(atom):
943943
# verify all matching packages are deprecated
944944
pkgs = self.options.search_repo.match(atom.no_usedeps)
945-
if all(self.deprecated(x.versioned_atom) for x in pkgs):
945+
if all(map(self.deprecated, pkgs)):
946946
deprecated[attr].add(atom)
947947

948948
if in_or_restriction and atom.slot_operator == "=":
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
{"__class__": "DeprecatedDep", "category": "DeprecatedDep", "package": "nonoptional", "version": "0", "attr": "RDEPEND", "atoms": ["stub/deprecated"]}
2-
{"__class__": "DeprecatedDep", "category": "DeprecatedDep", "package": "optional", "version": "0", "attr": "RDEPEND", "atoms": ["stub/deprecated"]}
1+
{"__class__": "DeprecatedDep", "category": "DeprecatedDep", "package": "nonoptional", "version": "0", "attr": "RDEPEND", "atoms": ["stub/deprecated:0"]}
2+
{"__class__": "DeprecatedDep", "category": "DeprecatedDep", "package": "optional", "version": "0", "attr": "RDEPEND", "atoms": ["stub/deprecated:0"]}

testdata/data/repos/visibility/DependencyCheck/DeprecatedDep/fix.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ diff -Naur visibility/DeprecatedDep/nonoptional/nonoptional-0.ebuild fixed/Depre
55
SLOT="0"
66
LICENSE="BSD"
77
KEYWORDS="~amd64"
8-
-RDEPEND="stub/deprecated"
8+
-RDEPEND="stub/deprecated:0"
99
+RDEPEND="stub/unstable"
1010
diff -Naur visibility/DeprecatedDep/optional/optional-0.ebuild fixed/DeprecatedDep/optional/optional-0.ebuild
1111
--- visibility/DeprecatedDep/optional/optional-0.ebuild 2019-12-26 20:39:13.559577724 -0700
1212
+++ fixed/DeprecatedDep/optional/optional-0.ebuild 2019-12-26 20:39:47.650758627 -0700
1313
@@ -6,5 +6,5 @@
1414
KEYWORDS="~amd64"
1515
RDEPEND="
16-
!stub/deprecated
17-
- || ( stub/unstable stub/deprecated )
16+
!stub/deprecated:0
17+
- || ( stub/unstable stub/deprecated:0 )
1818
+ stub/unstable
1919
"

testdata/repos/visibility/DeprecatedDep/nonoptional/nonoptional-0.ebuild

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ HOMEPAGE="https://github.com/pkgcore/pkgcheck"
44
SLOT="0"
55
LICENSE="BSD"
66
KEYWORDS="~amd64"
7-
RDEPEND="stub/deprecated"
7+
RDEPEND="stub/deprecated:0"

testdata/repos/visibility/DeprecatedDep/optional/optional-0.ebuild

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ SLOT="0"
55
LICENSE="BSD"
66
KEYWORDS="~amd64"
77
RDEPEND="
8-
!stub/deprecated
9-
|| ( stub/unstable stub/deprecated )
8+
!stub/deprecated:0
9+
|| ( stub/unstable stub/deprecated:0 )
1010
"
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
stub/deprecated
1+
stub/deprecated:0

0 commit comments

Comments
 (0)