Changeset ferringb%2Fpkgcore-dev,3519

Timestamp:

07/15/08 11:29:07 (5 weeks ago)

Author:

Brian Harring <ferringb@…>

Message:

mangle check_values a bit to avoid name conflicts; additionally, fix ticket 201 in the process so that it does actual match attempts against the pkg instances that match

Location:

ferringb/pkgcore-dev

Files:

• NEWS (modified) (1 diff)
• pkgcore/scripts/pquery.py (modified) (4 diffs)

ferringb/pkgcore-dev/NEWS

@@ -4 +4 @@
 See ChangeLog for full commit logs; this is summarized/major changes.
 
+
+* ticket 201; pquery --restrict-revdep-pkgs wasn't behaving properly for 
+  slot/repository/user atoms, now does.
 
 * Correct potential segfaults in cpython version of PackageRestriction and

ferringb/pkgcore-dev/pkgcore/scripts/pquery.py

@@ -13 +13 @@
     commandline, repo_utils, parserestrict, packages as pkgutils)
 from snakeoil.demandload import demandload
-demandload(globals(), 're')
+from snakeoil.compatibility import any
+demandload(globals(), 're', 'snakeoil.currying:partial')
 
 
@@ -278 +279 @@
         raise optparse.OptionValueError('option %s: %s' % (opt_str, e))
 
+def revdep_pkgs_match(pkgs, value):
+    return any(value.match(pkg) for pkg in pkgs)
 
 class OptionParser(commandline.OptionParser):
@@ -443 +446 @@
             help='print what condition(s) trigger a dep.')
 
-    def check_values(self, values, args):
+    def check_values(self, vals, args):
         """Sanity check and postprocess after parsing."""
-        vals, args = commandline.OptionParser.check_values(self, values, args)
+        vals, args = commandline.OptionParser.check_values(self, vals, args)
         # Interpret args with parens in them as --expr additions, the
         # rest as --match additions (since parens are invalid in --match).
@@ -541 +544 @@
             l = []
             # odd?  a bit; we allow strs to reuse parse_revdep
-            for atom in revdep_pkgs:
+            for atom_inst in revdep_pkgs:
                 for repo in vals.repos:
-                    l.extend(parse_revdep(str(x.versioned_atom))
-                        for x in repo.itermatch(atom))
-            vals.restrict_revdep_pkgs = l
-            if len(l) == 1:
-                vals.restrict.append(l[0])
-            else:
-                vals.restrict.append(packages.OrRestriction(finalize=True,
-                    *l))
+                    l.extend(repo.itermatch(atom_inst))
+            # have our pkgs; now build the restrict.
+            r = values.FlatteningRestriction(atom.atom,
+                values.AnyMatch(values.FunctionRestriction(
+                    partial(revdep_pkgs_match, tuple(l))
+                )))
+            vals.restrict_revdep_pkgs = packages.OrRestriction(finalize=True,
+                *list(
+                    packages.PackageRestriction(dep, r)
+                        for dep in ('depends', 'rdepends', 'post_rdepends')))
+            vals.restrict.append(vals.restrict_revdep_pkgs)
 
         # Build up a restriction.