From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6AB3458973 for ; Tue, 2 Feb 2016 00:50:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E759821C07E; Tue, 2 Feb 2016 00:50:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 68E6D21C049 for ; Tue, 2 Feb 2016 00:50:09 +0000 (UTC) Received: from professor-x (S010634bdfa9ecf80.vc.shawcable.net [96.49.31.57]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: dolsen) by smtp.gentoo.org (Postfix) with ESMTPSA id 9B017340AF2 for ; Tue, 2 Feb 2016 00:50:08 +0000 (UTC) Date: Mon, 1 Feb 2016 16:49:17 -0800 From: Brian Dolbec To: gentoo-portage-dev@lists.gentoo.org Subject: Re: [gentoo-portage-dev] [PATCH] Make config update tools stand out (bug 543706) Message-ID: <20160201164917.0cded35b.dolsen@gentoo.org> In-Reply-To: <1454344668-6366-1-git-send-email-bernalex@gentoo.org> References: <1454344668-6366-1-git-send-email-bernalex@gentoo.org> Organization: Gentoo Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Archives-Salt: 617cbb9b-bea9-4f89-9fa8-e2be6a188148 X-Archives-Hash: 99ffc0c671f32ea5a7d6cee662629411 On Mon, 1 Feb 2016 17:37:48 +0100 Alexander Berntsen wrote: > Add a CONFIGURATION FILES UPDATE TOOLS header to the manpage, to make > the tools discussion stand out from the configuration files discussion > in general. > > Refer to the new section in emerge's configuration file updates > output. > > X-Gentoo-Bug: 543706 > X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=543706 > > Suggested-by: Julian Ospald > Signed-off-by: Alexander Berntsen > --- > man/emerge.1 | 1 + > pym/_emerge/chk_updated_cfg_files.py | 6 +++--- > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/man/emerge.1 b/man/emerge.1 > index 05b2a01..0f5782e 100644 > --- a/man/emerge.1 > +++ b/man/emerge.1 > @@ -1237,6 +1237,7 @@ add this to \fBmake.conf\fR(5): > .LP > .I CONFIG_PROTECT_MASK="/etc/wget /etc/rc.d" > .LP > +.SH "CONFIGURATION FILES UPDATE TOOLS" > 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. > diff --git a/pym/_emerge/chk_updated_cfg_files.py > b/pym/_emerge/chk_updated_cfg_files.py index 9f2ab6f..6903df9 100644 > --- a/pym/_emerge/chk_updated_cfg_files.py > +++ b/pym/_emerge/chk_updated_cfg_files.py > @@ -36,7 +36,7 @@ def chk_updated_cfg_files(eroot, config_protect): > > if result: > print(" " + yellow("*") + " See the " + > - colorize("INFORM", _("CONFIGURATION FILES")) > + > - " " + _("section of the") + " " + > bold("emerge")) > - print(" " + yellow("*") + " " + > + colorize("INFORM", _("CONFIGURATION FILES")) > + " and " + > + colorize("INFORM", _("CONFIGURATION FILES > UPDATE TOOLS"))) > + print(" " + yellow("*") + " sections of the " + > bold("emerge") + " " + _("man page to learn how to update config > files.")) Looks great :) -- Brian Dolbec