From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C7F7A13877A for ; Sat, 14 Jun 2014 20:59:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B5669E0AF2; Sat, 14 Jun 2014 20:59:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2F17BE0A72 for ; Sat, 14 Jun 2014 20:59:00 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1C82533FD8A for ; Sat, 14 Jun 2014 20:58:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 5CDBE18741 for ; Sat, 14 Jun 2014 20:58:57 +0000 (UTC) From: "Alexander Berntsen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexander Berntsen" Message-ID: <1402778788.ab02c3fd788da6cc36188cdbee62a2b22bbc2474.bernalex@gentoo> 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: bernalex X-VCS-Committer-Name: Alexander Berntsen X-VCS-Revision: ab02c3fd788da6cc36188cdbee62a2b22bbc2474 X-VCS-Branch: master Date: Sat, 14 Jun 2014 20:58:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 95f51a47-5673-4c5c-9e81-39ef64744958 X-Archives-Hash: d6dcf403efb3dc1ea37fa718c5fe3a70 commit: ab02c3fd788da6cc36188cdbee62a2b22bbc2474 Author: Alexander Berntsen plaimi net> AuthorDate: Mon Oct 7 10:39:50 2013 +0000 Commit: Alexander Berntsen gentoo org> CommitDate: Sat Jun 14 20:46:28 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ab02c3fd emerge: Don't split suggestion (bug 487074) Signed-off-by: Alexander Berntsen gentoo.org> --- pym/_emerge/actions.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index ff72d70..4ca2f1c 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -557,10 +557,9 @@ def action_depclean(settings, trees, ldpath_mtimes, msg.append("\n") msg.append("As a safety measure, depclean will not remove any packages\n") msg.append("unless *all* required dependencies have been resolved. As a\n") - msg.append("consequence, it is often necessary to run %s\n" % \ - good("`emerge --update")) - msg.append(good("--newuse --deep @world`") + \ - " prior to depclean.\n") + msg.append("consequence of this, it often becomes necessary to run \n") + msg.append("%s" % good("`emerge --update --newuse --deep @world`") + + " prior to depclean.\n") if action == "depclean" and "--quiet" not in myopts and not myfiles: portage.writemsg_stdout("\n")