projects
/
portage.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
98e6bb4
)
slot_collision_handler: Minor formatting changes
author
Sebastian Luther
<SebastianLuther@gmx.de>
Mon, 7 Jun 2010 21:01:02 +0000
(23:01 +0200)
committer
Zac Medico
<zmedico@gentoo.org>
Thu, 12 Aug 2010 08:17:24 +0000
(
01:17
-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 88cf8fb3f32fa48722bf809084826db943c397f4..81eb77ed21706a1a107474d85b27b50b0c5157d7 100644
(file)
--- a/
pym/_emerge/resolver/slot_collision.py
+++ b/
pym/_emerge/resolver/slot_collision.py
@@
-294,8
+294,8
@@
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 += "!!!
Enabling --newuse and --update might solve this conflict.\n"
+ msg += "!!!
If not, it might at least allow emerge to give a suggestions.\n\n"
return msg
solutions = self.solutions