diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-09-29 13:43:08 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-09-30 17:53:41 -0700 |
| commit | 874479989c83d0c8922810619fc971e3993dfb6a (patch) | |
| tree | d270a25551c0681b100462dd83717b3a8871a510 /pym/_emerge | |
| parent | 4e41255d40f0931907f5c36ba1e9a77929eea7b3 (diff) | |
| download | portage-874479989c83d0c8922810619fc971e3993dfb6a.tar.gz portage-874479989c83d0c8922810619fc971e3993dfb6a.tar.bz2 portage-874479989c83d0c8922810619fc971e3993dfb6a.zip | |
Tweak depgraph._show_unsatisfied_dep() display for AtomArg instances.
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/depgraph.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index aa6992f55..7763c3b8c 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -2168,6 +2168,8 @@ class depgraph(object): xinfo = '"%s"' % atom.unevaluated_atom if arg: xinfo='"%s"' % arg + if isinstance(myparent, AtomArg): + xinfo = _unicode_decode('"%s"') % (myparent,) # Discard null/ from failed cpv_expand category expansion. xinfo = xinfo.replace("null/", "") masked_packages = [] @@ -2411,6 +2413,12 @@ class depgraph(object): # Show parent nodes and the argument that pulled them in. traversed_nodes = set() node = myparent + if isinstance(myparent, AtomArg): + # It's redundant to show parent for AtomArg since + # it's the same as 'xinfo' displayed above. + node = None + else: + node = myparent msg = [] while node is not None: traversed_nodes.add(node) @@ -2444,8 +2452,9 @@ class depgraph(object): else: selected_parent = parent node = selected_parent - writemsg_stdout("\n".join(msg), noiselevel=-1) - writemsg_stdout("\n", noiselevel=-1) + if msg: + writemsg_stdout("\n".join(msg), noiselevel=-1) + writemsg_stdout("\n", noiselevel=-1) if mask_docs: show_mask_docs() |