summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-04-30 11:00:58 +0000
committerZac Medico <zmedico@gentoo.org>2006-04-30 11:00:58 +0000
commit5dd0999bb15312b4d1ea2c5fb44d652364299eca (patch)
tree2e7b4462c1488ed1cad04e9f6b531a78d3d8e0cf
parent157c2f4615a60c60188f3f62bb76cad7fda0981a (diff)
downloadportage-5dd0999bb15312b4d1ea2c5fb44d652364299eca.tar.gz
portage-5dd0999bb15312b4d1ea2c5fb44d652364299eca.tar.bz2
portage-5dd0999bb15312b4d1ea2c5fb44d652364299eca.zip
Update portage config update messages to mention dispatch-conf (in addition to etc-update). Thanks to genstef for reporting this.
svn path=/main/trunk/; revision=3283
-rw-r--r--pym/emergehelp.py5
-rw-r--r--pym/portage_data.py3
2 files changed, 5 insertions, 3 deletions
diff --git a/pym/emergehelp.py b/pym/emergehelp.py
index 3b8c2d7bc..1abb497ab 100644
--- 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 3739e6c59..be6a342bc 100644
--- 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