Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/
Date: Sat, 29 Nov 2014 18:06:39
Message-Id: 1417284241.b5b0d117433843da6a8d695140a68c7f13cf72ac.zmedico@gentoo
1 commit: b5b0d117433843da6a8d695140a68c7f13cf72ac
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Fri Nov 28 22:27:18 2014 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 29 18:04:01 2014 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=b5b0d117
7
8 emerge: warn about @installed, don't deprecate (387059)
9
10 The @installed set may have some legitimate uses. Therefore, change
11 the deprecation warning to a warning about unsolved blockers. The
12 warning will now appear as follows:
13
14 * The @installed set is not recommended when updating
15 * packages because it will often introduce unsolved blocker
16 * conflicts. Please refer to bug #387059 for details.
17
18 X-Gentoo-Bug: 387059
19 X-Gentoo-Url: https://bugs.gentoo.org/show_bug.cgi?id=387059
20 Acked-by: Brian Dolbec <dolsen <AT> gentoo.org>
21
22 ---
23 pym/_emerge/actions.py | 8 +++++---
24 1 file changed, 5 insertions(+), 3 deletions(-)
25
26 diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
27 index dec5b04..d9c45c1 100644
28 --- a/pym/_emerge/actions.py
29 +++ b/pym/_emerge/actions.py
30 @@ -3538,10 +3538,12 @@ def expand_set_arguments(myfiles, myaction, root_config):
31 display_missing_pkg_set(root_config, s)
32 return (None, 1)
33 if s == "installed":
34 - msg = ("The @installed set is deprecated and will soon be "
35 - "removed. Please refer to bug #387059 for details.")
36 + msg = ("The @installed set is not recommended when "
37 + "updating packages because it will often "
38 + "introduce unsolved blocker conflicts. Please "
39 + "refer to bug #387059 for details.")
40 out = portage.output.EOutput()
41 - for line in textwrap.wrap(msg, 50):
42 + for line in textwrap.wrap(msg, 57):
43 out.ewarn(line)
44 setconfig.active.append(s)