summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Luther <SebastianLuther@gmx.de>2010-06-07 19:54:37 +0200
committerZac Medico <zmedico@gentoo.org>2010-08-12 01:17:24 -0700
commit30d4d5dabaf09454a92cf71dd30be9ff1c5c707e (patch)
tree4e1d24add77a5d5eb212c2a656668220ed7dc3ee
parente59b1f47270c497e9051e637200a0659d752a4d0 (diff)
downloadportage-30d4d5dabaf09454a92cf71dd30be9ff1c5c707e.tar.gz
portage-30d4d5dabaf09454a92cf71dd30be9ff1c5c707e.tar.bz2
portage-30d4d5dabaf09454a92cf71dd30be9ff1c5c707e.zip
slot_collision_handler: Don't print an explanation for version based conflicts.
-rw-r--r--pym/_emerge/resolver/slot_collision.py12
1 files changed, 11 insertions, 1 deletions
diff --git a/pym/_emerge/resolver/slot_collision.py b/pym/_emerge/resolver/slot_collision.py
index 9c291f60a..116b3368e 100644
--- a/pym/_emerge/resolver/slot_collision.py
+++ b/pym/_emerge/resolver/slot_collision.py
@@ -53,6 +53,10 @@ class slot_conflict_handler(object):
#If any conflict package was pulled in only by unspecific atoms, then
#the user forgot to enable --newuse and/or --update.
self.conflict_is_unspecific = False
+
+ #Indicate if the conflict is caused by incompatible version requirements
+ #cat/pkg-2 pulled in, but a parent requires <cat/pkg-2
+ self.is_a_version_conflict = False
self._prepare_conflict_msg_and_check_for_specificity()
@@ -261,7 +265,10 @@ class slot_conflict_handler(object):
use.append(sub_type)
atom_str = highlight_violations(atom.unevaluated_atom, version_violated, use)
-
+
+ if version_violated:
+ self.is_a_version_conflict = True
+
msg.append("%s required by %s" % (atom_str, parent))
msg.append("\n")
@@ -283,6 +290,9 @@ class slot_conflict_handler(object):
msg.append("\n")
def print_explanation(self):
+ if self.is_a_version_conflict:
+ return False
+
if self.conflict_is_unspecific and \
not ("--newuse" in self.myopts and "--update" in self.myopts):
writemsg("!!!Enabling --newuse and --update might solve this conflict.\n")