Update portage config update messages to mention dispatch-conf (in addition to etc...

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

diff --git a/pym/emergehelp.py b/pym/emergehelp.py
index 3b8c2d7bc8b1419c927ca5f51facbc698b19d1b6..1abb497ab36aca483efbb05b09359fc8e74b7c9f 100644 (file)
--- a/pym/emergehelp.py
+++ b/pym/emergehelp.py
@@ -376,8 +376,9 @@ add this to /etc/make.conf:
 
 CONFIG_PROTECT_MASK="/etc/wget /etc/rc.d"
 
-etc-update is also available to aid in the merging of these files. It provides
-a vimdiff interactive merging setup and can auto-merge trivial changes.
+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.
 
 """
                print outstuff

diff --git a/pym/portage_data.py b/pym/portage_data.py
index 3739e6c59acd26fb2588ff84f335ae4afce97988..be6a342bce2ecb7d643822046540f139b396105d 100644 (file)
--- a/pym/portage_data.py
+++ b/pym/portage_data.py
@@ -63,7 +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 an 'etc-update' should remedy this problem.\n")
+       writemsg("`emerge baselayout` and a config update with dispatch-conf or etc-update\n")
+       writemsg("should remedy this problem.\n")
        pass
 
 #Discover the uid and gid of the portage user/group