diff options
author | Zac Medico <zmedico@gentoo.org> | 2012-07-18 14:38:09 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2012-07-18 14:38:09 -0700 |
commit | 30ec783c0fc64a02fda38980bded22dc0055a42d (patch) | |
tree | b025a74c77ced261b2f38f1ae954043757ede558 /bin/portageq | |
parent | 2472be18586f41c6e74a6d1f6a88c17a415eca9b (diff) | |
download | portage-30ec783c0fc64a02fda38980bded22dc0055a42d.tar.gz portage-30ec783c0fc64a02fda38980bded22dc0055a42d.tar.bz2 portage-30ec783c0fc64a02fda38980bded22dc0055a42d.zip |
Fix extended atom match for =* operator.
Diffstat (limited to 'bin/portageq')
-rwxr-xr-x | bin/portageq | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/bin/portageq b/bin/portageq index 280fe94c2..d9abb0bad 100755 --- a/bin/portageq +++ b/bin/portageq @@ -583,17 +583,15 @@ def match(argv): require_metadata = atom.slot or atom.repo for cpv in vardb.cpv_all(): - if not portage.dep.extended_cp_match( - atom.cp, portage.cpv_getkey(cpv)): + if not portage.match_from_list(atom, [cpv]): continue if require_metadata: - slot, repo = vardb.aux_get(cpv, ["SLOT", "repository"]) - - if atom.slot is not None and atom.slot != slot: + try: + cpv = vardb._pkg_str(cpv, atom.repo) + except (KeyError, portage.exception.InvalidData): continue - - if atom.repo is not None and atom.repo != repo: + if not portage.match_from_list(atom, [cpv]): continue results.append(cpv) |