Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 124449 Details for
Bug 184806
portage-2.1.3_rc7 emerge traceback on multiple versions within a single package slot
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
fix KeyError triggered by slot collision
collision.patch (text/plain), 1.76 KB, created by
Zac Medico
on 2007-07-10 17:40:08 UTC
(
hide
)
Description:
fix KeyError triggered by slot collision
Filename:
MIME Type:
Creator:
Zac Medico
Created:
2007-07-10 17:40:08 UTC
Size:
1.76 KB
patch
obsolete
>Index: bin/emerge >=================================================================== >--- bin/emerge (revision 7214) >+++ bin/emerge (revision 7215) >@@ -1756,6 +1756,9 @@ > # Update old-style virtuals if this package provides any. > # These are needed for dep_virtual calls inside dep_check. > p_db = self.mydbapi[p_root] # contains cached metadata >+ if myparent in self._slot_collision_nodes: >+ # The metadata isn't cached due to the slot collision. >+ p_db = self.trees[p_root][self.pkg_tree_map[p_type]].dbapi > try: > self.pkgsettings[p_root].setinst(p_key, p_db) > # For consistency, also update the global virtuals. >@@ -2718,6 +2721,7 @@ > > for mylist_index in xrange(len(mylist)): > x, depth, ordered = mylist[mylist_index] >+ pkg_node = tuple(x) > pkg_type = x[0] > myroot = x[1] > pkg_key = x[2] >@@ -2749,14 +2753,16 @@ > addl += bad(" (is blocking %s)") % block_parents > blockers.append(addl) > else: >- mydbapi = self.trees[myroot][self.pkg_tree_map[pkg_type]].dbapi > pkg_status = x[3] > pkg_merge = ordered and pkg_status != "nomerge" > binary_package = pkg_type != "ebuild" >+ if pkg_node in self._slot_collision_nodes: >+ # The metadata isn't cached due to the slot collision. >+ mydbapi = self.trees[myroot][self.pkg_tree_map[pkg_type]].dbapi >+ else: >+ mydbapi = self.mydbapi[myroot] # contains cached metadata > metadata = dict(izip(self._mydbapi_keys, >- self.mydbapi[myroot].aux_get( >- pkg_key, self._mydbapi_keys))) >- mydbapi = self.mydbapi[myroot] # use the cached metadata >+ mydbapi.aux_get(pkg_key, self._mydbapi_keys))) > if pkg_key not in self.useFlags[myroot]: > """If this is a --resume then the USE flags need to be > fetched from the appropriate locations here."""
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 184806
: 124449