From c5016fbdb4ed87ea971e363b5d0906310fbe965d Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 18 Dec 2007 09:27:37 +0000 Subject: [PATCH] Display the merge list with blockers any time that there are blockers, instead of telling the user to try again with --pretend. svn path=/main/trunk/; revision=8953 --- pym/_emerge/__init__.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 22bf73f96..85b0566b6 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -6535,12 +6535,15 @@ def action_build(settings, trees, mtimedb, for x in pkglist: if x[0] != "blocks": continue - msg = "Error: the " + x[2] + " package conflicts " + \ - "with another package; the two packages cannot " + \ - "be installed on the same system together. " + \ - "Please use 'emerge --pretend' to determine blockers." + retval = mydepgraph.display(mydepgraph.altlist( + reversed=("--tree" in myopts)), + favorites=favorites) + msg = "Error: The above package list contains " + \ + "packages which cannot be installed " + \ + "at the same time on the same system." prefix = bad(" * ") from textwrap import wrap + print for line in wrap(msg, 70): print prefix + line if "--quiet" not in myopts: -- 2.26.2