diff options
author | Zac Medico <zmedico@gentoo.org> | 2011-02-21 18:38:45 -0800 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2011-02-21 19:13:32 -0800 |
commit | 6c9b5bd5ab98d9302b6cbf146f54b45e6e4a0d83 (patch) | |
tree | 7793d159300e82f0f73f007e041a04866d885a07 | |
parent | 30171eeca3749560b1078fff02ce83fed6d41b67 (diff) | |
download | portage-6c9b5bd5ab98d9302b6cbf146f54b45e6e4a0d83.tar.gz portage-6c9b5bd5ab98d9302b6cbf146f54b45e6e4a0d83.tar.bz2 portage-6c9b5bd5ab98d9302b6cbf146f54b45e6e4a0d83.zip |
chk_updated_cfg_files: fix plurality of message
This will fix bug #355803.
-rw-r--r-- | 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 eece67139..616995042 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -2923,9 +2923,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")\ |