From ff3b5059ea1b37ac27ae917441fd6f7a4e1eff8d Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 21 Sep 2009 13:48:15 +0000 Subject: [PATCH] Use dep_expand instead of key_expand in the blocker display, since it seems like a better fit. Also, use str(atom) since we don't want to assume that Atoms are string type (though they happen to be now). This assumption is what caused the traceback in bug 285637, comment #5. svn path=/main/trunk/; revision=14320 --- pym/_emerge/depgraph.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 4954c1a3e..44bb7b45f 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -3980,14 +3980,14 @@ class depgraph(object): counters.blocks += 1 if x.satisfied: counters.blocks_satisfied += 1 - resolved = portage.key_expand( + resolved = portage.dep_expand( str(x.atom).lstrip("!"), mydb=vardb, settings=pkgsettings) if "--columns" in self._frozen_config.myopts and "--quiet" in self._frozen_config.myopts: - addl += " " + colorize(blocker_style, resolved) + addl += " " + colorize(blocker_style, str(resolved)) else: addl = "[%s %s] %s%s" % \ (colorize(blocker_style, "blocks"), - addl, indent, colorize(blocker_style, resolved)) + addl, indent, colorize(blocker_style, str(resolved))) block_parents = self._dynamic_config._blocker_parents.parent_nodes(x) block_parents = set([pnode[2] for pnode in block_parents]) block_parents = ", ".join(block_parents) -- 2.26.2