projects
/
portage.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9bdc01a
)
slot_conflict: tweak message and fix grammar
author
Zac Medico
<zmedico@gentoo.org>
Tue, 15 Mar 2011 22:58:02 +0000
(15:58 -0700)
committer
Zac Medico
<zmedico@gentoo.org>
Tue, 15 Mar 2011 22:58:02 +0000
(15:58 -0700)
pym/_emerge/resolver/slot_collision.py
patch
|
blob
|
history
diff --git
a/pym/_emerge/resolver/slot_collision.py
b/pym/_emerge/resolver/slot_collision.py
index b3d816b881c0a0af459d38ffc84f21b27a6ca9d4..f130422ff7348f0eb5a6a81446a9c6b6d096c868 100644
(file)
--- a/
pym/_emerge/resolver/slot_collision.py
+++ b/
pym/_emerge/resolver/slot_collision.py
@@
-457,7
+457,7
@@
class slot_conflict_handler(object):
if self.conflict_is_unspecific and \
not ("--newuse" in self.myopts and "--update" in self.myopts):
msg += "!!! Enabling --newuse and --update might solve this conflict.\n"
- msg += "!!! If not, it might
at least allow emerge to give a suggestions
.\n\n"
+ msg += "!!! If not, it might
help emerge to give a more specific suggestion
.\n\n"
return msg
solutions = self.solutions