|
Lines 1591-1596
class config:
Link Here
|
| 1591 |
virts = flatten(portage_dep.use_reduce(portage_dep.paren_reduce(provides), uselist=myuse.split())) |
1591 |
virts = flatten(portage_dep.use_reduce(portage_dep.paren_reduce(provides), uselist=myuse.split())) |
| 1592 |
|
1592 |
|
| 1593 |
cp = dep_getkey(mycpv) |
1593 |
cp = dep_getkey(mycpv) |
|
|
1594 |
if cp.startswith("virtual/"): |
| 1595 |
# Bridge new-style virtual into old-style. |
| 1596 |
virts.append(cp) |
| 1594 |
for virt in virts: |
1597 |
for virt in virts: |
| 1595 |
virt = dep_getkey(virt) |
1598 |
virt = dep_getkey(virt) |
| 1596 |
if not self.treeVirtuals.has_key(virt): |
1599 |
if not self.treeVirtuals.has_key(virt): |
|
Lines 1829-1835
class config:
Link Here
|
| 1829 |
ptVirtuals.setdefault(virt, []) |
1832 |
ptVirtuals.setdefault(virt, []) |
| 1830 |
ptVirtuals[virt].append(cp) |
1833 |
ptVirtuals[virt].append(cp) |
| 1831 |
|
1834 |
|
| 1832 |
return stack_dictlist([ptVirtuals, self.treeVirtuals, self.dirVirtuals]) |
1835 |
virtuals = stack_dictlist([ptVirtuals, self.treeVirtuals, |
|
|
1836 |
self.dirVirtuals]) |
| 1837 |
# Bridge new-style virtuals into old-style. |
| 1838 |
for k, v in virtuals.iteritems(): |
| 1839 |
if k not in v: |
| 1840 |
v.append(k) |
| 1841 |
return virtuals |
| 1833 |
|
1842 |
|
| 1834 |
def __delitem__(self,mykey): |
1843 |
def __delitem__(self,mykey): |
| 1835 |
self.modifying() |
1844 |
self.modifying() |
|
Lines 4651-4656
class vartree(packagetree):
Link Here
|
| 4651 |
if not mys: |
4660 |
if not mys: |
| 4652 |
mys = string.split(myprovide, "/") |
4661 |
mys = string.split(myprovide, "/") |
| 4653 |
myprovides += [mys[0] + "/" + mys[1]] |
4662 |
myprovides += [mys[0] + "/" + mys[1]] |
|
|
4663 |
if mycpv.startswith("virtual/"): |
| 4664 |
# Bridge new-style virtual into old-style. |
| 4665 |
myprovides.append(dep_getkey(mycpv)) |
| 4654 |
return myprovides |
4666 |
return myprovides |
| 4655 |
except SystemExit, e: |
4667 |
except SystemExit, e: |
| 4656 |
raise |
4668 |
raise |
