diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-04-21 18:54:38 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-04-21 18:54:38 +0000 |
| commit | 1781f3603402325a85c46d85ab4ac594e380fec7 (patch) | |
| tree | fb0919a28029f7d90aca1c5012076fab1f4c685b | |
| parent | e4ab433f635c4a3d912e0218dace669f49c27074 (diff) | |
| download | portage-1781f3603402325a85c46d85ab4ac594e380fec7.tar.gz portage-1781f3603402325a85c46d85ab4ac594e380fec7.tar.bz2 portage-1781f3603402325a85c46d85ab4ac594e380fec7.zip | |
In show_slot_collision_notice(), refer to the problem as a "slot conflict"
since that's how I'm refering to it in the docs.
svn path=/main/trunk/; revision=9938
| -rw-r--r-- | pym/_emerge/__init__.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 84ea00005..dfa2def65 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -1694,8 +1694,9 @@ class depgraph(object): msg = [] msg.append("\n!!! Multiple versions within a single " + \ - "package slot have been \n") - msg.append("!!! pulled into the dependency graph:\n\n") + "package slot have been pulled\n") + msg.append("!!! into the dependency graph, resulting" + \ + " in a slot conflict:\n\n") indent = " " # Max number of parents shown, to avoid flooding the display. max_parents = 3 |