Add cfg-update to the list of happy config file managers.

svn path=/main/trunk/; revision=3290

diff --git a/pym/emergehelp.py b/pym/emergehelp.py
index 1abb497ab36aca483efbb05b09359fc8e74b7c9f..2fd8b898a7db4fbeaf2ab014abdf7d0c070a9004 100644 (file)
--- a/pym/emergehelp.py
+++ b/pym/emergehelp.py
@@ -376,9 +376,9 @@ add this to /etc/make.conf:
 
 CONFIG_PROTECT_MASK="/etc/wget /etc/rc.d"
 
-Tools such as dispatch-conf and etc-update are also available to aid in the
-merging of these files. They provide interactive merging and can auto-merge
-trivial changes.
+Tools such as dispatch-conf, cfg-update, and etc-update are also available to
+aid in the merging of these files. They provide interactive merging and can
+auto-merge trivial changes.
 
 """
                print outstuff

diff --git a/pym/portage_data.py b/pym/portage_data.py
index be6a342bce2ecb7d643822046540f139b396105d..f92c7ace105bd6c030823dc42bd296ef02d0bf71 100644 (file)
--- a/pym/portage_data.py
+++ b/pym/portage_data.py
@@ -63,8 +63,8 @@ try:
 except KeyError:
        writemsg("portage initialization: your system doesn't have a 'wheel' group.\n")
        writemsg("Please fix this as it is a normal system requirement. 'wheel' is GID 10\n")
-       writemsg("`emerge baselayout` and a config update with dispatch-conf or etc-update\n")
-       writemsg("should remedy this problem.\n")
+       writemsg("`emerge baselayout` and a config update with dispatch-conf, etc-update\n")
+       writemsg("or cfg-update should remedy this problem.\n")
        pass
 
 #Discover the uid and gid of the portage user/group