Gentoo Archives: gentoo-portage-dev

From: Alexander Berntsen <bernalex@g.o>
To: gentoo-portage-dev@l.g.o
Subject: [gentoo-portage-dev] [PATCH] Make config update tools stand out (bug 543706)
Date: Mon, 01 Feb 2016 16:38:51
Message-Id: 1454344668-6366-1-git-send-email-bernalex@gentoo.org
1 Add a CONFIGURATION FILES UPDATE TOOLS header to the manpage, to make
2 the tools discussion stand out from the configuration files discussion
3 in general.
4
5 Refer to the new section in emerge's configuration file updates output.
6
7 X-Gentoo-Bug: 543706
8 X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=543706
9
10 Suggested-by: Julian Ospald <hasufell@g.o>
11 Signed-off-by: Alexander Berntsen <bernalex@g.o>
12 ---
13 man/emerge.1 | 1 +
14 pym/_emerge/chk_updated_cfg_files.py | 6 +++---
15 2 files changed, 4 insertions(+), 3 deletions(-)
16
17 diff --git a/man/emerge.1 b/man/emerge.1
18 index 05b2a01..0f5782e 100644
19 --- a/man/emerge.1
20 +++ b/man/emerge.1
21 @@ -1237,6 +1237,7 @@ add this to \fBmake.conf\fR(5):
22 .LP
23 .I CONFIG_PROTECT_MASK="/etc/wget /etc/rc.d"
24 .LP
25 +.SH "CONFIGURATION FILES UPDATE TOOLS"
26 Tools such as dispatch\-conf, cfg\-update, and etc\-update are also available
27 to aid in the merging of these files. They provide interactive merging and can
28 auto\-merge trivial changes.
29 diff --git a/pym/_emerge/chk_updated_cfg_files.py b/pym/_emerge/chk_updated_cfg_files.py
30 index 9f2ab6f..6903df9 100644
31 --- a/pym/_emerge/chk_updated_cfg_files.py
32 +++ b/pym/_emerge/chk_updated_cfg_files.py
33 @@ -36,7 +36,7 @@ def chk_updated_cfg_files(eroot, config_protect):
34
35 if result:
36 print(" " + yellow("*") + " See the " +
37 - colorize("INFORM", _("CONFIGURATION FILES")) +
38 - " " + _("section of the") + " " + bold("emerge"))
39 - print(" " + yellow("*") + " " +
40 + colorize("INFORM", _("CONFIGURATION FILES")) + " and " +
41 + colorize("INFORM", _("CONFIGURATION FILES UPDATE TOOLS")))
42 + print(" " + yellow("*") + " sections of the " + bold("emerge") + " " +
43 _("man page to learn how to update config files."))
44 --
45 2.4.10

Replies