1 |
commit: ea26df1ef9b3dcb7a6a45b487342cc7149a77be5 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Mar 27 18:56:32 2012 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Mar 27 18:56:32 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ea26df1e |
7 |
|
8 |
emerge: suggest dispatch-conf for bug #398843 |
9 |
|
10 |
--- |
11 |
pym/_emerge/depgraph.py | 6 +++--- |
12 |
1 files changed, 3 insertions(+), 3 deletions(-) |
13 |
|
14 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
15 |
index 072a5ea..c01dc72 100644 |
16 |
--- a/pym/_emerge/depgraph.py |
17 |
+++ b/pym/_emerge/depgraph.py |
18 |
@@ -1,4 +1,4 @@ |
19 |
-# Copyright 1999-2011 Gentoo Foundation |
20 |
+# Copyright 1999-2012 Gentoo Foundation |
21 |
# Distributed under the terms of the GNU General Public License v2 |
22 |
|
23 |
from __future__ import print_function |
24 |
@@ -6143,7 +6143,7 @@ class depgraph(object): |
25 |
if protect_obj[root].isprotected(file_to_write_to): |
26 |
# We want to force new_protect_filename to ensure |
27 |
# that the user will see all our changes via |
28 |
- # etc-update, even if file_to_write_to doesn't |
29 |
+ # dispatch-conf, even if file_to_write_to doesn't |
30 |
# exist yet, so we specify force=True. |
31 |
file_to_write_to = new_protect_filename(file_to_write_to, |
32 |
force=True) |
33 |
@@ -6197,7 +6197,7 @@ class depgraph(object): |
34 |
noiselevel=-1) |
35 |
writemsg_stdout("".join(problems), noiselevel=-1) |
36 |
elif write_to_file and roots: |
37 |
- writemsg_stdout("\nAutounmask changes successfully written. Remember to run etc-update.\n", \ |
38 |
+ writemsg_stdout("\nAutounmask changes successfully written. Remember to run dispatch-conf.\n", \ |
39 |
noiselevel=-1) |
40 |
elif not pretend and not autounmask_write and roots: |
41 |
writemsg_stdout("\nUse --autounmask-write to write changes to config files (honoring CONFIG_PROTECT).\n", \ |