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.

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

Author: mattst88

pym/gentoolkit/dependencies.py

@@ -236,7 +236,7 @@ def graph_reverse_depends(
 
             found_match = False
             for dep in pkgdep.get_all_depends():
-                if dep.intersects(self):
+                if dep.intersects(self.atom):
                     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 = ""