dependencies: fix graph_reverse_depends crash on Atom.intersects

Atom.intersects() type-checks its argument since portage removed str
subtyping from Atom, so it needs a real Atom object, not a Dependencies
(a Query subclass) or a plain string.

graph_reverse_depends() called dep.intersects(self) where self is a
Dependencies object. Pass self.atom instead, but that then exposed a
second bug: gentoolkit.atom.Atom.__init__ sets self.atom to the raw atom
string it was constructed from (used by __repr__/__str__).
Query.__init__ copied that string into self.atom via __dict__.update(),
and its fallback except branch set self.atom = self.cpv (also a plain
string), so Query.atom was never actually usable as an Atom. Fix both:
restore self.atom to the real Atom object in the success path, and
construct one from self.cpv in the fallback path.

That still leaves bare package-name queries (e.g. "simdjson") crashing:
they parse as neither a valid atom nor a valid CPV, so Query.__init__
falls back further to a plain string in self.atom, which
Atom.intersects() can't type-check. Since gentoolkit's Atom can't
represent a name-only atom at all (portage.dep.Atom rejects it),
graph_reverse_depends() now passes self instead of self.atom whenever
self.atom isn't a real Atom. self already carries the .cp/.category/.name
attributes intersects() needs for its name-only comparison, and since
self.cp (unslashed) never equals dep.cp ("cat/pkg"), that comparison
always takes the early-return branch, so the attributes intersects()
doesn't check (.repo, .slot, etc.) are never touched.

Bug: https://bugs.gentoo.org/981521
Signed-off-by: Matt Turner <mattst88@gentoo.org>

Author: mattst88

pym/gentoolkit/dependencies.py

@@ -227,6 +227,16 @@ def graph_reverse_depends(
         if seen is None:
             seen = set()
 
+        # self.atom is a real Atom only when the query parsed as a valid
+        # atom; a bare package name (e.g. "simdjson") falls back to a plain
+        # string that Atom.intersects() can't type-check. Pass self instead:
+        # it has the .cp/.category/.name attributes intersects() needs for
+        # its name-only comparison, and since self.cp (unslashed) never
+        # equals dep.cp ("cat/pkg"), that comparison always takes the
+        # early-return branch, so the attributes intersects() doesn't check
+        # (.repo, .slot, etc.) are never touched.
+        target = self.atom if isinstance(self.atom, Atom) else self
+
         for pkgdep in (Dependencies(pkg) for pkg in pkgset):
             if self.cp not in pkgdep.get_raw_depends():
                 # fast path for obviously non-matching packages. This saves
@@ -236,7 +246,7 @@ def graph_reverse_depends(
 
             found_match = False
             for dep in pkgdep.get_all_depends():
-                if dep.intersects(self):
+                if dep.intersects(target):
                     pkgdep.depatom = dep
                     pkgdep.depth = depth
                     yield pkgdep

pym/gentoolkit/query.py

@@ -60,6 +60,10 @@ def __init__(self, query, is_regex=False):
             try:
                 atom = Atom(self.query)
                 self.__dict__.update(atom.__dict__)
+                # gentoolkit.atom.Atom.__init__ sets self.atom to the raw
+                # atom string (for __repr__/__str__), clobbering what should
+                # be a reference to the Atom object itself; restore it.
+                self.atom = atom
                 # portage.dep.Atom uses __slots__, so cpv, _cp, and _version
                 # are absent from atom.__dict__; initialize them explicitly so
                 # CPV's lazy property accessors don't raise AttributeError.
@@ -75,7 +79,13 @@ def __init__(self, query, is_regex=False):
             except errors.GentoolkitInvalidAtom:
                 CPV.__init__(self, self.query)
                 self.operator = ""
-                self.atom = self.cpv
+                # self.cpv may contain glob/regex wildcards (e.g. from a
+                # regex query), which aren't valid atom syntax; fall back to
+                # the plain string in that case.
+                try:
+                    self.atom = Atom(f"={self.cpv}")
+                except errors.GentoolkitInvalidAtom:
+                    self.atom = self.cpv
 
     def __repr__(self):
         rx = ""