Lines 505-511
Link Here
|
505 |
print "emerge: search: aux_get() failed, skipping" |
505 |
print "emerge: search: aux_get() failed, skipping" |
506 |
continue |
506 |
continue |
507 |
if self.searchre.search(full_desc): |
507 |
if self.searchre.search(full_desc): |
508 |
self.matches["desc"].append([full_package,masked]) |
508 |
mycpv = portage.catpkgsplit(full_package) |
|
|
509 |
mypkg = mycpv[0]+"/"+mycpv[1] |
510 |
self.matches["desc"].append([mypkg,masked]) |
509 |
self.mlen=0 |
511 |
self.mlen=0 |
510 |
for mtype in self.matches.keys(): |
512 |
for mtype in self.matches.keys(): |
511 |
self.matches[mtype].sort() |
513 |
self.matches[mtype].sort() |
Lines 518-533
Link Here
|
518 |
print " " |
520 |
print " " |
519 |
for mtype in self.matches.keys(): |
521 |
for mtype in self.matches.keys(): |
520 |
for match,masked in self.matches[mtype]: |
522 |
for match,masked in self.matches[mtype]: |
521 |
if mtype=="pkg": |
523 |
print match, portage.pkgsplit(match) |
522 |
catpack=match |
524 |
catpack=match |
523 |
full_package = portage.portdb.xmatch("bestmatch-visible",match) |
525 |
full_package = portage.portdb.xmatch("bestmatch-visible",match) |
524 |
if not full_package: |
526 |
if not full_package: |
525 |
#no match found; we don't want to query description |
527 |
#no match found; we don't want to query description |
526 |
masked=1 |
528 |
masked=1 |
527 |
full_package=portage.best(portage.portdb.xmatch("match-all",match)) |
529 |
full_package=portage.best(portage.portdb.xmatch("match-all",match)) |
528 |
else: |
|
|
529 |
full_package=match |
530 |
catpack=portage.pkgsplit(match)[0] |
531 |
if full_package: |
530 |
if full_package: |
532 |
try: |
531 |
try: |
533 |
desc, homepage, license = portage.portdb.aux_get(full_package,["DESCRIPTION","HOMEPAGE","LICENSE"]) |
532 |
desc, homepage, license = portage.portdb.aux_get(full_package,["DESCRIPTION","HOMEPAGE","LICENSE"]) |