From 1459cc2242354aaddeb51e33d1b83b31c502f60a Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 18 Dec 2007 09:28:32 +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. (trunk r8953) svn path=/main/branches/2.1.2/; revision=8954 --- bin/emerge | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/bin/emerge b/bin/emerge index 608c1ba9b..9cfb9bdb9 100755 --- a/bin/emerge +++ b/bin/emerge @@ -6047,12 +6047,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