|
Lines 1756-1761
Link Here
|
| 1756 |
# Update old-style virtuals if this package provides any. |
1756 |
# Update old-style virtuals if this package provides any. |
| 1757 |
# These are needed for dep_virtual calls inside dep_check. |
1757 |
# These are needed for dep_virtual calls inside dep_check. |
| 1758 |
p_db = self.mydbapi[p_root] # contains cached metadata |
1758 |
p_db = self.mydbapi[p_root] # contains cached metadata |
|
|
1759 |
if myparent in self._slot_collision_nodes: |
| 1760 |
# The metadata isn't cached due to the slot collision. |
| 1761 |
p_db = self.trees[p_root][self.pkg_tree_map[p_type]].dbapi |
| 1759 |
try: |
1762 |
try: |
| 1760 |
self.pkgsettings[p_root].setinst(p_key, p_db) |
1763 |
self.pkgsettings[p_root].setinst(p_key, p_db) |
| 1761 |
# For consistency, also update the global virtuals. |
1764 |
# For consistency, also update the global virtuals. |
|
Lines 2718-2723
Link Here
|
| 2718 |
|
2721 |
|
| 2719 |
for mylist_index in xrange(len(mylist)): |
2722 |
for mylist_index in xrange(len(mylist)): |
| 2720 |
x, depth, ordered = mylist[mylist_index] |
2723 |
x, depth, ordered = mylist[mylist_index] |
|
|
2724 |
pkg_node = tuple(x) |
| 2721 |
pkg_type = x[0] |
2725 |
pkg_type = x[0] |
| 2722 |
myroot = x[1] |
2726 |
myroot = x[1] |
| 2723 |
pkg_key = x[2] |
2727 |
pkg_key = x[2] |
|
Lines 2749-2762
Link Here
|
| 2749 |
addl += bad(" (is blocking %s)") % block_parents |
2753 |
addl += bad(" (is blocking %s)") % block_parents |
| 2750 |
blockers.append(addl) |
2754 |
blockers.append(addl) |
| 2751 |
else: |
2755 |
else: |
| 2752 |
mydbapi = self.trees[myroot][self.pkg_tree_map[pkg_type]].dbapi |
|
|
| 2753 |
pkg_status = x[3] |
2756 |
pkg_status = x[3] |
| 2754 |
pkg_merge = ordered and pkg_status != "nomerge" |
2757 |
pkg_merge = ordered and pkg_status != "nomerge" |
| 2755 |
binary_package = pkg_type != "ebuild" |
2758 |
binary_package = pkg_type != "ebuild" |
|
|
2759 |
if pkg_node in self._slot_collision_nodes: |
| 2760 |
# The metadata isn't cached due to the slot collision. |
| 2761 |
mydbapi = self.trees[myroot][self.pkg_tree_map[pkg_type]].dbapi |
| 2762 |
else: |
| 2763 |
mydbapi = self.mydbapi[myroot] # contains cached metadata |
| 2756 |
metadata = dict(izip(self._mydbapi_keys, |
2764 |
metadata = dict(izip(self._mydbapi_keys, |
| 2757 |
self.mydbapi[myroot].aux_get( |
2765 |
mydbapi.aux_get(pkg_key, self._mydbapi_keys))) |
| 2758 |
pkg_key, self._mydbapi_keys))) |
|
|
| 2759 |
mydbapi = self.mydbapi[myroot] # use the cached metadata |
| 2760 |
if pkg_key not in self.useFlags[myroot]: |
2766 |
if pkg_key not in self.useFlags[myroot]: |
| 2761 |
"""If this is a --resume then the USE flags need to be |
2767 |
"""If this is a --resume then the USE flags need to be |
| 2762 |
fetched from the appropriate locations here.""" |
2768 |
fetched from the appropriate locations here.""" |
