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 1PriBY-0002Ob-Ln for garchives@archives.gentoo.org; Tue, 22 Feb 2011 02:41:09 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 71564E058A; Tue, 22 Feb 2011 02:41:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 35687E058A for ; Tue, 22 Feb 2011 02:41:00 +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 B9FE31B413F for ; Tue, 22 Feb 2011 02:40:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 25D378006A for ; Tue, 22 Feb 2011 02:40:59 +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: f11ed8dc9f35d8d211173fd6f9a24091ed86d36b Date: Tue, 22 Feb 2011 02:40:59 +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: f12bfcb2f63be704dde3b50be16d3c20 commit: f11ed8dc9f35d8d211173fd6f9a24091ed86d36b Author: Zac Medico gentoo org> AuthorDate: Tue Feb 22 02:38:45 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Feb 22 02:38:45 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Df11ed8dc chk_updated_cfg_files: fix plurality of message This will fix bug #355803. --- pym/_emerge/actions.py | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 08a92d6..980ad75 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -2944,9 +2944,15 @@ def chk_updated_cfg_files(eroot, config_protect): for x in result: print("\n"+colorize("WARN", " * IMPORTANT:"), end=3D' ') if not x[1]: # it's a protected file - print("config file '%s' needs updating." % x[0]) + writemsg_level("config file '%s' needs updating.\n" % x[0], + level=3Dlogging.INFO, noiselevel=3D-1) else: # it's a protected dir - print("%d config files in '%s' need updating." % (len(x[1]), x[0])) + if len(x[1]) =3D=3D 1: + writemsg_level("config file '%s' needs updating.\n" % x[1][0], + level=3Dlogging.INFO, noiselevel=3D-1) + else: + writemsg_level("%d config files in '%s' need updating.\n" % \ + (len(x[1]), x[0]), level=3Dlogging.INFO, noiselevel=3D-1) =20 if result: print(" "+yellow("*")+" See the "+colorize("INFORM","CONFIGURATION FIL= ES")\