diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-04-21 18:55:14 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-04-21 18:55:14 +0000 |
| commit | a76308f072b67c1d938fe62811c569273504b661 (patch) | |
| tree | 6604871812fa7ae4197dfce391021d2dd88fa97e /bin | |
| parent | e3f1ec30298450fff790dd270138198265463f65 (diff) | |
| download | portage-a76308f072b67c1d938fe62811c569273504b661.tar.gz portage-a76308f072b67c1d938fe62811c569273504b661.tar.bz2 portage-a76308f072b67c1d938fe62811c569273504b661.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. (trunk r9938)
svn path=/main/branches/2.1.2/; revision=9939
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge index 85160bc40..0634ee263 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1833,8 +1833,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 |