diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-09-21 13:48:15 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-09-21 13:48:15 +0000 |
| commit | ff3b5059ea1b37ac27ae917441fd6f7a4e1eff8d (patch) | |
| tree | 08b6027ada35ca377f9019a77642849bea6ef67a | |
| parent | 24add28602df1b752804f735d3b51fa16b9cdb83 (diff) | |
| download | portage-ff3b5059ea1b37ac27ae917441fd6f7a4e1eff8d.tar.gz portage-ff3b5059ea1b37ac27ae917441fd6f7a4e1eff8d.tar.bz2 portage-ff3b5059ea1b37ac27ae917441fd6f7a4e1eff8d.zip | |
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
| -rw-r--r-- | pym/_emerge/depgraph.py | 6 |
1 files 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) |