From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QNXir-0002nX-Ps for garchives@archives.gentoo.org; Fri, 20 May 2011 21:59:06 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C937C1C008; Fri, 20 May 2011 21:58:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 885B61C008 for ; Fri, 20 May 2011 21:58:57 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A61981B4004 for ; Fri, 20 May 2011 21:58:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 078C58001E for ; Fri, 20 May 2011 21:58:55 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/actions.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: acddb2ec3ccb332b048eb1ebedba63d555fa46a0 Date: Fri, 20 May 2011 21:58:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 4ba191d329a0badcf0027dfa57651b4a commit: acddb2ec3ccb332b048eb1ebedba63d555fa46a0 Author: Zac Medico gentoo org> AuthorDate: Fri May 20 21:56:08 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri May 20 21:56:08 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dacddb2ec depclean: adjust failure message wrt --with-bdeps We need to be more explicit about using --with-bdeps=3Dy, since this subtlety often leads to confusion. --- pym/_emerge/actions.py | 30 +++++++++++++++++++++--------- 1 files changed, 21 insertions(+), 9 deletions(-) diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 215203a..809eda1 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -786,15 +786,27 @@ def calc_depclean(settings, trees, ldpath_mtimes, msg.append(" %s pulled in by:" % (atom,)) msg.append(" %s" % (parent,)) msg.append("") - msg.append("Have you forgotten to run " + \ - good("`emerge --update --newuse --deep @world`") + " prior") - msg.append(("to %s? It may be necessary to manually " + \ - "uninstall packages that no longer") % action) - msg.append("exist in the portage tree since " + \ - "it may not be possible to satisfy their") - msg.append("dependencies. Also, be aware of " + \ - "the --with-bdeps option that is documented") - msg.append("in " + good("`man emerge`") + ".") + msg.extend(textwrap.wrap( + "Have you forgotten to do a complete update prior " + \ + "depclean? The most comprehensive command for this " + \ + "purpose is as follows:", 65 + )) + msg.append("") + msg.append(" " + \ + good("emerge --update --newuse --deep --with-bdeps=3Dy @world")) + msg.append("") + msg.extend(textwrap.wrap( + "Note that the --with-bdeps=3Dy option is not required in " + \ + "many situations. Refer to the emerge manual page " + \ + "(run `man emerge`) for more information about " + \ + "--with-bdeps.", 65 + )) + msg.append("") + msg.extend(textwrap.wrap( + "Also, note that it may be necessary to manually uninstall " + \ + "packages that no longer exist in the portage tree, since " + \ + "it may not be possible to satisfy their dependencies.", 65 + )) if action =3D=3D "prune": msg.append("") msg.append("If you would like to ignore " + \