Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 104914 Details for
Bug 159310
portage slot collision notice overshadows unresolvable blockers
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
don't show a slot collision notice if there are unresolvable blockers
blockers.patch (text/plain), 2.10 KB, created by
Zac Medico
on 2006-12-29 03:12:53 UTC
(
hide
)
Description:
don't show a slot collision notice if there are unresolvable blockers
Filename:
MIME Type:
Creator:
Zac Medico
Created:
2006-12-29 03:12:53 UTC
Size:
2.10 KB
patch
obsolete
>Index: bin/emerge >=================================================================== >--- bin/emerge (revision 5412) >+++ bin/emerge (revision 5413) >@@ -1010,6 +1010,7 @@ > self.args_keys = [] > self.blocker_digraph = digraph() > self.blocker_parents = {} >+ self._slot_collision_info = [] > self._altlist_cache = {} > self._pprovided_args = [] > >@@ -1176,16 +1177,31 @@ > priority=priority) > return 1 > else: >+ # A slot collision has occurred. Sometimes this coincides >+ # with unresolvable blockers, so the slot collision will be >+ # shown later if there are no unresolvable blockers. > e_parents = self._parent_child_digraph.parent_nodes( > existing_node) > myparents = [] > if myparent: > myparents.append(myparent) >- self._show_slot_collision_notice( >- ((jbigkey, myparents), >- (existing_node, e_parents))) >- return 0 >+ self._slot_collision_info.append( >+ ((jbigkey, myparents), (existing_node, e_parents))) > >+ # Now add this node to the graph so that self.display() >+ # can work with it show use flags and --tree output. >+ self.useFlags[myroot][mykey] = myuse >+ self._parent_child_digraph.add(jbigkey, myparent) >+ if rev_dep and myparent: >+ self.digraph.add(myparent, jbigkey, >+ priority=priority) >+ else: >+ self.digraph.add(jbigkey, myparent, >+ priority=priority) >+ # The slot collision has rendered the graph invalid, so >+ # there's no need to process dependencies of this node. >+ return 1 >+ > self._slot_node_map[myroot][slot_atom] = jbigkey > self.pkg_node_map[myroot][mykey] = jbigkey > self.useFlags[myroot][mykey] = myuse >@@ -1905,6 +1921,14 @@ > # Validate blockers that depend on merge order. > if not self.blocker_digraph.empty(): > self.altlist() >+ if self._slot_collision_info: >+ # The user is only notified of a slot collision if there are no >+ # unresolvable blocks. >+ for x in self.altlist(): >+ if x[0] == "blocks": >+ return True >+ self._show_slot_collision_notice(self._slot_collision_info[0]) >+ return False > return True > > def altlist(self, reversed=False):
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 159310
: 104914