From: Zac Medico Date: Tue, 22 Feb 2011 02:38:45 +0000 (-0800) Subject: chk_updated_cfg_files: fix plurality of message X-Git-Tag: v2.2.0_alpha25~6 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f11ed8dc9f35d8d211173fd6f9a24091ed86d36b;p=portage.git chk_updated_cfg_files: fix plurality of message This will fix bug #355803. --- diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 08a92d677..980ad7563 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=' ') 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=logging.INFO, noiselevel=-1) else: # it's a protected dir - print("%d config files in '%s' need updating." % (len(x[1]), x[0])) + if len(x[1]) == 1: + writemsg_level("config file '%s' needs updating.\n" % x[1][0], + level=logging.INFO, noiselevel=-1) + else: + writemsg_level("%d config files in '%s' need updating.\n" % \ + (len(x[1]), x[0]), level=logging.INFO, noiselevel=-1) if result: print(" "+yellow("*")+" See the "+colorize("INFORM","CONFIGURATION FILES")\