* [gentoo-commits] portage r10133 - main/branches/2.1.2/bin
@ 2008-05-03 8:25 Zac Medico (zmedico)
0 siblings, 0 replies; only message in thread
From: Zac Medico (zmedico) @ 2008-05-03 8:25 UTC (permalink / raw
To: gentoo-commits
Author: zmedico
Date: 2008-05-03 08:25:40 +0000 (Sat, 03 May 2008)
New Revision: 10133
Modified:
main/branches/2.1.2/bin/emerge
Log:
* Move circular deps and blocker displays to depgraph.display_problems().
* Always call display_problems() since calling it from inside display()
can lead to unwanted recursion.
(trunk r10132)
Modified: main/branches/2.1.2/bin/emerge
===================================================================
--- main/branches/2.1.2/bin/emerge 2008-05-03 08:21:02 UTC (rev 10132)
+++ main/branches/2.1.2/bin/emerge 2008-05-03 08:25:40 UTC (rev 10133)
@@ -1898,6 +1898,8 @@
self._missing_args = []
self._masked_installed = []
self._unsatisfied_deps_for_display = []
+ self._unsatisfied_blockers_for_display = None
+ self._circular_deps_for_display = None
self._dep_stack = []
self._unsatisfied_deps = []
self._ignored_deps = []
@@ -1916,6 +1918,8 @@
if not self._slot_collision_info:
return
+ self._show_merge_list()
+
msg = []
msg.append("\n!!! Multiple versions within a single " + \
"package slot have been pulled\n")
@@ -3868,43 +3872,7 @@
continue
if not selected_nodes:
- # No leaf nodes are available, so we have a circular
- # dependency panic situation. Reduce the noise level to a
- # minimum via repeated elimination of root nodes since they
- # have no parents and thus can not be part of a cycle.
- while True:
- root_nodes = mygraph.root_nodes(
- ignore_priority=DepPriority.MEDIUM_SOFT)
- if not root_nodes:
- break
- for node in root_nodes:
- mygraph.remove(node)
- # Display the USE flags that are enabled on nodes that are part
- # of dependency cycles in case that helps the user decide to
- # disable some of them.
- display_order = []
- tempgraph = mygraph.copy()
- while not tempgraph.empty():
- nodes = tempgraph.leaf_nodes()
- if not nodes:
- node = tempgraph.order[0]
- else:
- node = nodes[0]
- display_order.append(node)
- tempgraph.remove(node)
- display_order.reverse()
- self.myopts.pop("--quiet", None)
- self.myopts.pop("--verbose", None)
- self.myopts["--tree"] = True
- print
- print
- self.display(display_order)
- print "!!! Error: circular dependencies:"
- print
- mygraph.debug_print()
- print
- print "!!! Note that circular dependencies can often be avoided by temporarily"
- print "!!! disabling USE flags that trigger optional dependencies."
+ self._circular_deps_for_display = mygraph
raise self._unknown_internal_error()
# At this point, we've succeeded in selecting one or more nodes, so
@@ -3984,26 +3952,79 @@
if unsolvable_blockers and \
not self._accept_blocker_conflicts():
- quiet = "--quiet" in self.myopts
- display_list = retlist[:]
- if tree_mode:
- display_list.reverse()
- portage.writemsg("\n", noiselevel=-1)
- self.display(display_list)
- msg = "Error: The above package list contains " + \
- "packages which cannot be installed " + \
- "at the same time on the same system."
- prefix = bad(" * ")
- from textwrap import wrap
- portage.writemsg("\n", noiselevel=-1)
- for line in wrap(msg, 70):
- portage.writemsg(prefix + line + "\n", noiselevel=-1)
- if not quiet:
- show_blocker_docs_link()
+ self._unsatisfied_blockers_for_display = unsolvable_blockers
+ self._serialized_tasks_cache = retlist[:]
raise self._unknown_internal_error()
+ if self._slot_collision_info and \
+ not self._accept_blocker_conflicts():
+ self._serialized_tasks_cache = retlist[:]
+ raise self._unknown_internal_error()
+
return retlist
+ def _show_circular_deps(self, mygraph):
+ # No leaf nodes are available, so we have a circular
+ # dependency panic situation. Reduce the noise level to a
+ # minimum via repeated elimination of root nodes since they
+ # have no parents and thus can not be part of a cycle.
+ while True:
+ root_nodes = mygraph.root_nodes(
+ ignore_priority=DepPriority.MEDIUM_SOFT)
+ if not root_nodes:
+ break
+ mygraph.difference_update(root_nodes)
+ # Display the USE flags that are enabled on nodes that are part
+ # of dependency cycles in case that helps the user decide to
+ # disable some of them.
+ display_order = []
+ tempgraph = mygraph.copy()
+ while not tempgraph.empty():
+ nodes = tempgraph.leaf_nodes()
+ if not nodes:
+ node = tempgraph.order[0]
+ else:
+ node = nodes[0]
+ display_order.append(node)
+ tempgraph.remove(node)
+ display_order.reverse()
+ self.myopts.pop("--quiet", None)
+ self.myopts.pop("--verbose", None)
+ self.myopts["--tree"] = True
+ portage.writemsg("\n\n", noiselevel=-1)
+ self.display(display_order)
+ prefix = colorize("BAD", " * ")
+ portage.writemsg("\n", noiselevel=-1)
+ portage.writemsg(prefix + "Error: circular dependencies:\n",
+ noiselevel=-1)
+ portage.writemsg("\n", noiselevel=-1)
+ mygraph.debug_print()
+ portage.writemsg("\n", noiselevel=-1)
+ portage.writemsg(prefix + "Note that circular dependencies " + \
+ "can often be avoided by temporarily\n", noiselevel=-1)
+ portage.writemsg(prefix + "disabling USE flags that trigger " + \
+ "optional dependencies.\n", noiselevel=-1)
+
+ def _show_merge_list(self):
+ if self._serialized_tasks_cache is not None:
+ display_list = self._serialized_tasks_cache[:]
+ if "--tree" in self.myopts:
+ display_list.reverse()
+ self.display(display_list)
+
+ def _show_unsatisied_blockers(self, blockers):
+ self._show_merge_list()
+ msg = "Error: The above package list contains " + \
+ "packages which cannot be installed " + \
+ "at the same time on the same system."
+ prefix = colorize("BAD", " * ")
+ from textwrap import wrap
+ portage.writemsg("\n", noiselevel=-1)
+ for line in wrap(msg, 70):
+ portage.writemsg(prefix + line + "\n", noiselevel=-1)
+ if "--quiet" not in self.myopts:
+ show_blocker_docs_link()
+
def display(self, mylist, favorites=[], verbosity=None):
if verbosity is None:
verbosity = ("--quiet" in self.myopts and 1 or \
@@ -4682,7 +4703,6 @@
sys.stdout.write(text)
sys.stdout.flush()
- self.display_problems()
return os.EX_OK
def display_problems(self):
@@ -4694,17 +4714,16 @@
to ensure that the user is notified of problems with the graph.
"""
- task_list = self._serialized_tasks_cache
+ if self._circular_deps_for_display is not None:
+ self._show_circular_deps(
+ self._circular_deps_for_display)
- # Any blockers must be appended to the tail of the list,
- # so we only need to check the last item.
- have_blocker_conflict = bool(task_list and \
- (isinstance(task_list[-1], Blocker) and \
- not task_list[-1].satisfied))
-
# The user is only notified of a slot conflict if
# there are no unresolvable blocker conflicts.
- if not have_blocker_conflict:
+ if self._unsatisfied_blockers_for_display is not None:
+ self._show_unsatisied_blockers(
+ self._unsatisfied_blockers_for_display)
+ else:
self._show_slot_collision_notice()
# TODO: Add generic support for "set problem" handlers so that
@@ -7745,11 +7764,11 @@
except portage_exception.PackageNotFound, e:
portage.writemsg("\n!!! %s\n" % str(e), noiselevel=-1)
return 1
+ if show_spinner:
+ print "\b\b... done!"
if not retval:
mydepgraph.display_problems()
return 1
- if "--quiet" not in myopts and "--nodeps" not in myopts:
- print "\b\b... done!"
display = pretend or \
((ask or tree or verbose) and not (quiet and not ask))
if not display:
@@ -7768,6 +7787,7 @@
retval = mydepgraph.display(
mydepgraph.altlist(reversed=tree),
favorites=favorites)
+ mydepgraph.display_problems()
if retval != os.EX_OK:
return retval
prompt="Would you like to resume merging these packages?"
@@ -7775,6 +7795,7 @@
retval = mydepgraph.display(
mydepgraph.altlist(reversed=("--tree" in myopts)),
favorites=favorites)
+ mydepgraph.display_problems()
if retval != os.EX_OK:
return retval
mergecount=0
@@ -7818,12 +7839,14 @@
retval = mydepgraph.display(
mydepgraph.altlist(reversed=tree),
favorites=favorites)
+ mydepgraph.display_problems()
if retval != os.EX_OK:
return retval
else:
retval = mydepgraph.display(
mydepgraph.altlist(reversed=("--tree" in myopts)),
favorites=favorites)
+ mydepgraph.display_problems()
if retval != os.EX_OK:
return retval
if "--buildpkgonly" in myopts:
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-05-03 8:25 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-03 8:25 [gentoo-commits] portage r10133 - main/branches/2.1.2/bin Zac Medico (zmedico)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox