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 1QtCMj-0006GL-OQ for garchives@archives.gentoo.org; Tue, 16 Aug 2011 05:39:05 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF0E621C044; Tue, 16 Aug 2011 05:38:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C03F221C044 for ; Tue, 16 Aug 2011 05:38:55 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 479661B4026 for ; Tue, 16 Aug 2011 05:38:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 58B8E80040 for ; Tue, 16 Aug 2011 05:38:54 +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: <415458868f42c677a1a6518c1e8d52b6597c751c.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/main.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 415458868f42c677a1a6518c1e8d52b6597c751c Date: Tue, 16 Aug 2011 05:38:54 +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: 453e7e058febfdf8b0bb71d8593d3cff commit: 415458868f42c677a1a6518c1e8d52b6597c751c Author: Mark Wagner gmail com> AuthorDate: Tue Aug 16 05:38:00 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Aug 16 05:38:00 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D41545886 Improve the invalid profile msg (bug 379327). --- pym/_emerge/main.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index 2830214..84c4c58 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -1466,10 +1466,10 @@ def profile_check(trees, myaction): continue # generate some profile related warning messages validate_ebuild_environment(trees) - msg =3D "If you have just changed your profile configuration, you " + = \ - "should revert back to the previous configuration. Due to " + \ - "your current profile being invalid, allowed actions are " + \ - "limited to --help, --info, --sync, and --version." + msg =3D ("Your current profile is invalid. If you have just changed " + "your profile configuration, you should revert back to the " + "previous configuration. Allowed actions are limited to " + "--help, --info, --sync, and --version.") writemsg_level("".join("!!! %s\n" % l for l in textwrap.wrap(msg, 70))= , level=3Dlogging.ERROR, noiselevel=3D-1) return 1