Author: zmedico
Date: 2008-12-09 17:29:07 +0000 (Tue, 09 Dec 2008)
New Revision: 12185
Modified:
main/trunk/pym/_emerge/__init__.py
main/trunk/pym/portage/__init__.py
Log:
When in --debug mode, make the depgraph call self.digraph.debug_print() to
display the final digraph state. This should help when troubleshooting
problems with blockers that don't resolve automatically, by making it easier
to see what pulled in unwanted packages.
Modified: main/trunk/pym/_emerge/__init__.py
===================================================================
--- main/trunk/pym/_emerge/__init__.py 2008-12-09 07:52:36 UTC (rev 12184)
+++ main/trunk/pym/_emerge/__init__.py 2008-12-09 17:29:07 UTC (rev 12185)
@@ -6415,6 +6415,12 @@
self._process_slot_conflicts()
def _serialize_tasks(self):
+
+ if "--debug" in self.myopts:
+ writemsg("\ndigraph:\n\n", noiselevel=-1)
+ self.digraph.debug_print()
+ writemsg("\n", noiselevel=-1)
+
scheduler_graph = self.digraph.copy()
mygraph=self.digraph.copy()
# Prune "nomerge" root nodes if nothing depends on them, since
Modified: main/trunk/pym/portage/__init__.py
===================================================================
--- main/trunk/pym/portage/__init__.py 2008-12-09 07:52:36 UTC (rev 12184)
+++ main/trunk/pym/portage/__init__.py 2008-12-09 17:29:07 UTC (rev 12185)
@@ -536,15 +536,17 @@
len(self.order)
def debug_print(self):
+ def output(s):
+ writemsg(s, noiselevel=-1)
for node in self.nodes:
- print node,
+ output("%s " % (node,))
if self.nodes[node][0]:
- print "depends on"
+ output("depends on\n")
else:
- print "(no children)"
+ output("(no children)\n")
for child in self.nodes[node][0]:
- print " ",child,
- print "(%s)" % self.nodes[node][0][child]
+ output(" %s (%s)\n" % \
+ (child, self.nodes[node][0][child],))
#parse /etc/env.d and generate /etc/profile.env
|
