public inbox for gentoo-portage-dev@lists.gentoo.org
 help / color / mirror / Atom feed
From: Sergei Trofimovich <slyfox@gentoo.org>
To: gentoo-portage-dev@lists.gentoo.org
Cc: zmedico@gentoo.org, Sergei Trofimovich <siarheit@google.com>,
	dolsen@gentoo.org, qa@gentoo.org, mgorny@gentoo.org
Subject: [gentoo-portage-dev] [PATCH v2] repoman: new QA error: slot operator under '||' alternative
Date: Sat, 18 Jun 2016 20:27:51 +0100	[thread overview]
Message-ID: <20160618192751.16652-1-slyfox@gentoo.org> (raw)
In-Reply-To: <20160618110253.4aac27c6.dolsen@gentoo.org>

From: Sergei Trofimovich <siarheit@google.com>

A few links discussing what can go wrong with slot operator under '||':
    https://archives.gentoo.org/gentoo-dev/message/81a4e1a1f5767e20009628ecd33da8d4
    https://archives.gentoo.org/gentoo-dev/message/66ff016a055e57b6027abcd36734e0e3

The main problem here is how vdb gets updated when you have a dependency of style:
    RDEPEND="|| ( foo:= bar:= )"
depending on what you have installed in system: only 'foo'/'bar' or both 'foo' and 'bar'.

I'm about to add actual test for some examples to gen-b0rk.

New repoman complains on them as follows:

    RDEPEND="|| ( =not-broken/pkg1-subslot-0:= =not-broken/pkg1-subslot-1:0= )"

Yields:

  dependency.badslotop [fatal]  2
   ebuild-test/RDEPEND-any-of-slotop/RDEPEND-any-of-slotop-0.ebuild: RDEPEND: '=not-broken/pkg1-subslot-0:=' uses ':=' slot operator under '||' dep clause.
   ebuild-test/RDEPEND-any-of-slotop/RDEPEND-any-of-slotop-0.ebuild: RDEPEND: '=not-broken/pkg1-subslot-1:0=' uses ':=' slot operator under '||' dep clause.

CC: dolsen@gentoo.org
CC: qa@gentoo.org
CC: mgorny@gentoo.org
Signed-off-by: Sergei Trofimovich <siarheit@google.com>
---
V2: made check_slotop function local, baked tree traversal in it
 .../repoman/modules/scan/depend/_depend_checks.py  | 42 ++++++++++++++++++++++
 repoman/pym/repoman/qa_data.py                     |  2 ++
 2 files changed, 44 insertions(+)

diff --git a/repoman/pym/repoman/modules/scan/depend/_depend_checks.py b/repoman/pym/repoman/modules/scan/depend/_depend_checks.py
index 4e1d216..2ee7e9c 100644
--- a/repoman/pym/repoman/modules/scan/depend/_depend_checks.py
+++ b/repoman/pym/repoman/modules/scan/depend/_depend_checks.py
@@ -3,11 +3,37 @@
 
 from _emerge.Package import Package
 
+from portage.dep import Atom
+
 from repoman.check_missingslot import check_missingslot
 # import our initialized portage instance
 from repoman._portage import portage
 from repoman.qa_data import suspect_virtual, suspect_rdepend
 
+def check_slotop(dep_tree, mytype, qatracker, relative_path, in_any_of=False):
+	'''Checks if RDEPEND uses ':=' slot operator
+	in '||' style dependencies.'''
+
+	# leaf
+	if isinstance(dep_tree, Atom):
+		atom = dep_tree
+		if in_any_of and atom.slot_operator:
+			qatracker.add_error("dependency.badslotop", relative_path +
+				": %s: '%s' uses ':=' slot operator under '||' dep clause." %
+				(mytype, atom))
+
+	# branches
+	if isinstance(dep_tree, list):
+		if len(dep_tree) == 0:
+			return
+		# entering any-of
+		if dep_tree[0] == '||':
+			check_slotop(dep_tree[1:], mytype, qatracker, relative_path,
+				in_any_of=True)
+		else:
+			for branch in dep_tree:
+				check_slotop(branch, mytype, qatracker, relative_path,
+					in_any_of=in_any_of)
 
 def _depend_checks(ebuild, pkg, portdb, qatracker, repo_metadata):
 	'''Checks the ebuild dependencies for errors
@@ -117,6 +143,22 @@ def _depend_checks(ebuild, pkg, portdb, qatracker, repo_metadata):
 
 		type_list.extend([mytype] * (len(badsyntax) - len(type_list)))
 
+		if runtime:
+			try:
+				# to find use of ':=' in '||' we preserve
+				# tree structure of dependencies
+				hier_atoms = portage.dep.use_reduce(
+					mydepstr,
+					flat=False,
+					matchall=1,
+					is_valid_flag=pkg.iuse.is_valid_flag,
+					opconvert=True,
+					token_class=token_class)
+			except portage.exception.InvalidDependString as e:
+				hier_atoms = None
+				badsyntax.append(str(e))
+			check_slotop(hier_atoms, mytype, qatracker, ebuild.relative_path)
+
 	for m, b in zip(type_list, badsyntax):
 		if m.endswith("DEPEND"):
 			qacat = "dependency.syntax"
diff --git a/repoman/pym/repoman/qa_data.py b/repoman/pym/repoman/qa_data.py
index b9475e8..48ab389 100644
--- a/repoman/pym/repoman/qa_data.py
+++ b/repoman/pym/repoman/qa_data.py
@@ -58,6 +58,8 @@ qahelp = {
 		"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)"),
+	"dependency.badslotop": (
+		"RDEPEND contains ':=' slot operator under '||' dependency."),
 	"file.executable": (
 		"Ebuilds, digests, metadata.xml, Manifest, and ChangeLog do not need"
 		" the executable bit"),
-- 
2.9.0



  reply	other threads:[~2016-06-18 19:28 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-18 17:01 [gentoo-portage-dev] [PATCH] repoman: typo in docstring s/dependancy/dependency/ Sergei Trofimovich
2016-06-18 17:01 ` [gentoo-portage-dev] [PATCH] repoman: whitespace: add indentation level after newline Sergei Trofimovich
2016-06-18 18:06   ` Brian Dolbec
2016-06-18 19:26     ` [gentoo-portage-dev] [PATCH v2] portage/dep/depcheck.py: Whitespace, " Sergei Trofimovich
2017-07-01  9:49       ` Sergei Trofimovich
2017-07-02 16:23       ` [gentoo-portage-dev] " Zac Medico
2016-06-18 17:01 ` [gentoo-portage-dev] [PATCH] repoman: new QA error: slot operator under '||' alternative Sergei Trofimovich
2016-06-18 18:02   ` Brian Dolbec
2016-06-18 19:27     ` Sergei Trofimovich [this message]
2016-06-18 21:15       ` [gentoo-portage-dev] Re: [PATCH v2] " Zac Medico
2016-06-18 22:00         ` [gentoo-portage-dev] [PATCH v4] " Sergei Trofimovich
2016-06-25 17:35           ` Brian Dolbec
2016-06-19  8:13         ` [gentoo-portage-dev] Re: [PATCH v2] " Sergei Trofimovich
     [not found]     ` <20160618203706.3fd97cb6@sf>
2016-06-18 20:38       ` [gentoo-portage-dev] [PATCH] " Brian Dolbec
2016-06-18 21:25         ` Zac Medico
2016-06-18 21:54         ` Sergei Trofimovich
2016-06-18 18:29 ` [gentoo-portage-dev] Re: [PATCH] repoman: typo in docstring s/dependancy/dependency/ Zac Medico
2016-06-18 19:27 ` [gentoo-portage-dev] [PATCH v2] repoman/modules/.../profile.py: " Sergei Trofimovich
2016-06-18 19:31   ` [gentoo-portage-dev] " Zac Medico

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160618192751.16652-1-slyfox@gentoo.org \
    --to=slyfox@gentoo.org \
    --cc=dolsen@gentoo.org \
    --cc=gentoo-portage-dev@lists.gentoo.org \
    --cc=mgorny@gentoo.org \
    --cc=qa@gentoo.org \
    --cc=siarheit@google.com \
    --cc=zmedico@gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox