Lines 6299-6311
Link Here
|
6299 |
|
6299 |
|
6300 |
accept_keywords = self.mysettings["ACCEPT_KEYWORDS"].split() |
6300 |
accept_keywords = self.mysettings["ACCEPT_KEYWORDS"].split() |
6301 |
pkgdict = self.mysettings.pkeywordsdict |
6301 |
pkgdict = self.mysettings.pkeywordsdict |
|
|
6302 |
aux_keys = ["KEYWORDS", "EAPI", "SLOT"] |
6302 |
for mycpv in mylist: |
6303 |
for mycpv in mylist: |
6303 |
try: |
6304 |
try: |
6304 |
keys, eapi = self.aux_get(mycpv, ["KEYWORDS", "EAPI"]) |
6305 |
keys, eapi, slot = self.aux_get(mycpv, aux_keys) |
6305 |
except KeyError: |
6306 |
except KeyError: |
6306 |
continue |
6307 |
continue |
6307 |
except portage_exception.PortageException, e: |
6308 |
except portage_exception.PortageException, e: |
6308 |
writemsg("!!! Error: aux_get('%s', ['KEYWORDS', 'EAPI'])\n" % \ |
6309 |
writemsg("!!! Error: aux_get('%s', %s)\n" % (mycpv, aux_keys), |
6309 |
mycpv, noiselevel=-1) |
6310 |
mycpv, noiselevel=-1) |
6310 |
writemsg("!!! %s\n" % str(e), noiselevel=-1) |
6311 |
writemsg("!!! %s\n" % str(e), noiselevel=-1) |
6311 |
del e |
6312 |
del e |
Lines 6316-6322
Link Here
|
6316 |
match=0 |
6317 |
match=0 |
6317 |
cp = dep_getkey(mycpv) |
6318 |
cp = dep_getkey(mycpv) |
6318 |
if pkgdict.has_key(cp): |
6319 |
if pkgdict.has_key(cp): |
6319 |
matches = match_to_list(mycpv, pkgdict[cp].keys()) |
6320 |
cpv_slot = "%s:%s" % (mycpv, slot) |
|
|
6321 |
matches = match_to_list(cpv_slot, pkgdict[cp].keys()) |
6320 |
for atom in matches: |
6322 |
for atom in matches: |
6321 |
pgroups.extend(pkgdict[cp][atom]) |
6323 |
pgroups.extend(pkgdict[cp][atom]) |
6322 |
if matches: |
6324 |
if matches: |