Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: lib/_emerge/, man/
Date: Sat, 31 Aug 2019 05:58:47
Message-Id: 1567229271.3cb5c78ccdd39644093d627afe3f9942e44f3ab4.zmedico@gentoo
1 commit: 3cb5c78ccdd39644093d627afe3f9942e44f3ab4
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 30 00:05:25 2019 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 31 05:27:51 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=3cb5c78c
7
8 emerge: deprecate --changelog option (bug 693096)
9
10 The emerge --changelog option is not very useful since the
11 gentoo repository no longer includes ChangeLog files.
12
13 Bug: https://bugs.gentoo.org/693096
14 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
15
16 lib/_emerge/actions.py | 5 +++++
17 man/emerge.1 | 2 ++
18 2 files changed, 7 insertions(+)
19
20 diff --git a/lib/_emerge/actions.py b/lib/_emerge/actions.py
21 index 6ca323501..705a3ff1c 100644
22 --- a/lib/_emerge/actions.py
23 +++ b/lib/_emerge/actions.py
24 @@ -2908,6 +2908,11 @@ def run_action(emerge_config):
25
26 adjust_configs(emerge_config.opts, emerge_config.trees)
27
28 + if "--changelog" in emerge_config.opts:
29 + writemsg_level(
30 + " %s The emerge --changelog (or -l) option is deprecated\n" %
31 + warn("*"), level=logging.WARNING, noiselevel=-1)
32 +
33 if profile_check(emerge_config.trees, emerge_config.action) != os.EX_OK:
34 return 1
35
36
37 diff --git a/man/emerge.1 b/man/emerge.1
38 index 4db2b3e62..d61250ec6 100644
39 --- a/man/emerge.1
40 +++ b/man/emerge.1
41 @@ -492,6 +492,8 @@ information about \fBFEATURES\fR settings).
42 .BR \-\-changelog ", " \-l
43 Use this in conjunction with the \fB\-\-pretend\fR option. This will
44 show the ChangeLog entries for all the packages that will be upgraded.
45 +This option is deprecated because ChangeLog files are no longer
46 +distributed with Gentoo's ebuild repository.
47 .TP
48 .BR "\-\-color < y | n >"
49 Enable or disable color output. This option will override \fINOCOLOR\fR