|
Line
Link Here
|
| 0 |
-- gentoolkit-0.3.0_rc9/pym/gentoolkit/equery/which.py |
0 |
++ gentoolkit-0.3.0_rc9/pym/gentoolkit/equery/which.py |
|
Lines 86-92
Link Here
|
| 86 |
|
86 |
|
| 87 |
for query in queries: |
87 |
for query in queries: |
| 88 |
|
88 |
|
| 89 |
matches = find_packages(query, QUERY_OPTS['includeMasked']) |
89 |
matches = find_packages(query, QUERY_OPTS['includeMasked'], False) |
| 90 |
if matches: |
90 |
if matches: |
| 91 |
pkg = sorted(matches).pop() |
91 |
pkg = sorted(matches).pop() |
| 92 |
ebuild_path = pkg.ebuild_path() |
92 |
ebuild_path = pkg.ebuild_path() |
| 93 |
-- gentoolkit-0.3.0_rc9/pym/gentoolkit/helpers.py |
93 |
++ gentoolkit-0.3.0_rc9/pym/gentoolkit/helpers.py |
|
Lines 521-527
Link Here
|
| 521 |
return [Package(x) for x in matches] |
521 |
return [Package(x) for x in matches] |
| 522 |
|
522 |
|
| 523 |
|
523 |
|
| 524 |
def find_packages(query, include_masked=False): |
524 |
def find_packages(query, include_masked=False, include_installed=True): |
| 525 |
"""Returns a list of Package objects that matched the query. |
525 |
"""Returns a list of Package objects that matched the query. |
| 526 |
|
526 |
|
| 527 |
@type query: str |
527 |
@type query: str |
|
Lines 542-548
Link Here
|
| 542 |
matches = PORTDB.xmatch("match-all", query) |
542 |
matches = PORTDB.xmatch("match-all", query) |
| 543 |
else: |
543 |
else: |
| 544 |
matches = PORTDB.match(query) |
544 |
matches = PORTDB.match(query) |
| 545 |
matches.extend(VARDB.match(query)) |
545 |
if include_installed: |
|
|
546 |
matches.extend(VARDB.match(query)) |
| 546 |
except portage.exception.InvalidAtom, err: |
547 |
except portage.exception.InvalidAtom, err: |
| 547 |
raise errors.GentoolkitInvalidAtom(str(err)) |
548 |
raise errors.GentoolkitInvalidAtom(str(err)) |
| 548 |
|
549 |
|
