Skip to content

Commit d680cf0

Browse files
committed
Do not report packages that are masked entirely in master
Signed-off-by: Michał Górny <[email protected]>
1 parent 5af49bb commit d680cf0

File tree

4 files changed

+17
-2
lines changed

4 files changed

+17
-2
lines changed

src/pkgcheck/checks/overlays.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,5 +160,9 @@ class MasterPackageClobberedCheck(OverlayRepoCheck, OptionalCheck):
160160
def feed(self, pkgset):
161161
pkg = pkgset[0]
162162
for repo in self.options.target_repo.masters:
163-
if repo.has_match(pkg.unversioned_atom):
164-
yield MasterPackageClobbered(str(repo), pkg=pkg)
163+
# Trigger only if at least one non-p.masked package matches,
164+
# to cover for packages being moved to subordinate repo.
165+
for master_pkg in repo.itermatch(pkg.unversioned_atom):
166+
if not repo.masked.match(master_pkg):
167+
yield MasterPackageClobbered(str(repo), pkg=pkg)
168+
break
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
DESCRIPTION="Ebuild clobbered by overlay"
2+
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
3+
LICENSE="BSD"
4+
SLOT="0"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
DESCRIPTION="Ebuild clobbered by overlay"
2+
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
3+
LICENSE="BSD"
4+
SLOT="0"
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
stub/masked
2+
3+
# Package being moved to ::overlay.
4+
<MasterPackageClobberedCheck/MasterPackageClobberedMasked-1

0 commit comments

Comments
 (0)