Re: [gentoo-portage-dev] [PATCH v2] repoman: check for ebuilds not using slot operator against multi-slot packages.

[Brian Dolbec]

On Mon,  4 Aug 2014 23:15:59 +0200
Michał Górny <mgorny@g.o> wrote:

The idea if that a particular dependency atom matches more than one slot
of a package, you are supposed to either use := or :* operator
(or a specific :slot dependency), whichever is appropriate.

This will help catching mistakes (when packages become slotted) and make
cross-slot behavior clear (it is undefined with no slot operator). I
will estimate the amount of new warnings later.
---
 bin/repoman | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/bin/repoman b/bin/repoman
index 71fc7f0..4809f52 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -78,7 +78,8 @@ from portage.output import ConsoleStyleFile, StyleWriter
 from portage.util import writemsg_level
 from portage.util._argparse import ArgumentParser
 from portage.package.ebuild.digestgen import digestgen
-from portage.eapi import eapi_has_iuse_defaults, eapi_has_required_use
+from portage.eapi import (eapi_has_iuse_defaults, eapi_has_required_use,
+	eapi_has_slot_operator)
 
 if sys.hexversion >= 0x3000000:
 	basestring = str
@@ -299,6 +300,7 @@ qahelp = {
 	"dependency.badindev": "User-visible ebuilds with unsatisfied dependencies (matched against *visible* ebuilds) in developing arch",
 	"dependency.badmaskedindev": "Masked ebuilds with unsatisfied dependencies (matched against *all* ebuilds) in developing arch",
 	"dependency.badtilde": "Uses the ~ dep operator with a non-zero revision part, which is useless (the revision is ignored)",
+	"dependency.missingslot": "RDEPEND matches more than one SLOT but does not specify a slot and/or use the := or :* slot operator",
 	"dependency.perlcore": "This ebuild directly depends on a package in perl-core; it should use the corresponding virtual instead.",
 	"dependency.syntax": "Syntax error in dependency string (usually an extra/missing space/parenthesis)",
 	"dependency.unknown": "Ebuild has a dependency that refers to an unknown package (which may be valid if it is a blocker for a renamed/removed package, or is an alternative choice provided by an overlay)",
@@ -387,6 +389,7 @@ qawarnings = set((
 "dependency.badindev",
 "dependency.badmaskedindev",
 "dependency.badtilde",
+"dependency.missingslot",
 "dependency.perlcore",
 "DESCRIPTION.punctuation",
 "DESCRIPTION.toolong",
@@ -2047,10 +2050,25 @@ for x in effective_scanlist:
 					# Skip dependency.unknown for blockers, so that we
 					# don't encourage people to remove necessary blockers,
 					# as discussed in bug #382407.


**********  This line is at line #563 in the repoman rewrite branch.

The next few lines look like they have your other patch applied...
But, to be honest, this is too big a code block to be adding to an already Wwwwwwaaaaaaaaayyyyyyy overloaded
code block.  This area of the code has already been split up in the rewrite.  
Please make this check an independent check in it's own file like is being done in the rewrite. 
It can later be easily moved to the new file structure.  I should also only involve adding 1 or 2 lines of code
to this code block.

-					if not is_blocker and \
-						not portdb.xmatch("match-all", atom) and \
-						not atom.cp.startswith("virtual/"):
-						unknown_pkgs.add((mytype, atom.unevaluated_atom))
+					# Also skip it for slot operator checks.
+					if not is_blocker:
+						atom_matches = portdb.xmatch("match-all", atom)
+						if not atom_matches and not atom.cp.startswith("virtual/"):
+							unknown_pkgs.add((mytype, atom.unevaluated_atom))
+
+						# If no slot or slot operator is specified in RDEP...
+						if (not atom.slot and not atom.slot_operator
+								and mytype == 'RDEPEND' and eapi_has_slot_operator(eapi)):
+							# Check whether it doesn't match more than one.
+							dep_slots = frozenset(
+									[portdb.aux_get(cpv, ['SLOT'])[0].split('/')[0]
+										for cpv in atom_matches])
+							if len(dep_slots) > 1:
+								stats["dependency.missingslot"] += 1
+								fails["dependency.missingslot"].append(
+									relative_path +
+									": %s: '%s' matches more than one slot, please specify an explicit slot and/or use the := or :* slot operator" %
+									(mytype, atom))
 
 					if catdir != "virtual":
 						if not is_blocker and \
-- 
2.0.4





-- 
Brian Dolbec <dolsen>