|
Lines 6364-6376
Link Here
|
| 6364 |
if len(virtual_atoms) == 1: |
6364 |
if len(virtual_atoms) == 1: |
| 6365 |
# It wouldn't make sense to block all the components of a |
6365 |
# It wouldn't make sense to block all the components of a |
| 6366 |
# compound virtual, so only a single atom block is allowed. |
6366 |
# compound virtual, so only a single atom block is allowed. |
| 6367 |
a.append("!" + virtual_atoms[0]) |
6367 |
a.append(portage.dep.Atom("!" + virtual_atoms[0])) |
| 6368 |
else: |
6368 |
else: |
| 6369 |
mycheck[1].append("="+y[0]) # pull in the new-style virtual |
6369 |
# pull in the new-style virtual |
|
|
6370 |
mycheck[1].append(portage.dep.Atom("="+y[0])) |
| 6370 |
a.append(mycheck[1]) |
6371 |
a.append(mycheck[1]) |
| 6371 |
# Plain old-style virtuals. New-style virtuals are preferred. |
6372 |
# Plain old-style virtuals. New-style virtuals are preferred. |
| 6372 |
for y in mychoices: |
6373 |
for y in mychoices: |
| 6373 |
a.append(x.replace(mykey, y)) |
6374 |
a.append(portage.dep.Atom(x.replace(mykey, y, 1))) |
| 6374 |
if isblocker and not a: |
6375 |
if isblocker and not a: |
| 6375 |
# Probably a compound virtual. Pass the atom through unprocessed. |
6376 |
# Probably a compound virtual. Pass the atom through unprocessed. |
| 6376 |
newsplit.append(x) |
6377 |
newsplit.append(x) |
