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 1PzdD5-0005X1-50 for garchives@archives.gentoo.org; Tue, 15 Mar 2011 22:59:27 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 32A801C00E; Tue, 15 Mar 2011 22:59:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id F11261C00E for ; Tue, 15 Mar 2011 22:59:17 +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 8D5631B4326 for ; Tue, 15 Mar 2011 22:59:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id EA72D8006A for ; Tue, 15 Mar 2011 22:59:16 +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: <07cd002a0e2a32eaa672a5f3e2e070f1aac18daf.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/resolver/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/resolver/slot_collision.py X-VCS-Directories: pym/_emerge/resolver/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 07cd002a0e2a32eaa672a5f3e2e070f1aac18daf Date: Tue, 15 Mar 2011 22:59:16 +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: 156153968065e2b57eb809fdba0ef785 commit: 07cd002a0e2a32eaa672a5f3e2e070f1aac18daf Author: Zac Medico gentoo org> AuthorDate: Tue Mar 15 22:58:02 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Mar 15 22:58:02 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D07cd002a slot_conflict: tweak message and fix grammar --- pym/_emerge/resolver/slot_collision.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pym/_emerge/resolver/slot_collision.py b/pym/_emerge/resolve= r/slot_collision.py index b3d816b..f130422 100644 --- a/pym/_emerge/resolver/slot_collision.py +++ b/pym/_emerge/resolver/slot_collision.py @@ -457,7 +457,7 @@ class slot_conflict_handler(object): if self.conflict_is_unspecific and \ not ("--newuse" in self.myopts and "--update" in self.myopts): msg +=3D "!!! Enabling --newuse and --update might solve this conflic= t.\n" - msg +=3D "!!! If not, it might at least allow emerge to give a sugges= tions.\n\n" + msg +=3D "!!! If not, it might help emerge to give a more specific su= ggestion.\n\n" return msg =20 solutions =3D self.solutions