1 |
On 7/26/19 2:28 AM, Ulrich Müller wrote: |
2 |
> Signed-off-by: Ulrich Müller <ulm@g.o> |
3 |
> --- |
4 |
> cnf/sets/portage.conf | 2 +- |
5 |
> lib/portage/const.py | 4 +--- |
6 |
> 2 files changed, 2 insertions(+), 4 deletions(-) |
7 |
> |
8 |
> diff --git a/cnf/sets/portage.conf b/cnf/sets/portage.conf |
9 |
> index ed4c6d9a7..38c50a647 100644 |
10 |
> --- a/cnf/sets/portage.conf |
11 |
> +++ b/cnf/sets/portage.conf |
12 |
> @@ -65,7 +65,7 @@ includes = live |
13 |
> [deprecated-live-rebuild] |
14 |
> class = portage.sets.dbapi.VariableSet |
15 |
> variable = INHERITED |
16 |
> -includes = bzr cvs darcs git git-2 git-r3 golang-vcs mercurial subversion tla |
17 |
> +includes = bzr cvs darcs git-2 git-r3 golang-vcs mercurial subversion |
18 |
> |
19 |
> # Installed packages that own files inside /lib/modules. |
20 |
> [module-rebuild] |
21 |
> diff --git a/lib/portage/const.py b/lib/portage/const.py |
22 |
> index edbfb9f17..0ed64a742 100644 |
23 |
> --- a/lib/portage/const.py |
24 |
> +++ b/lib/portage/const.py |
25 |
> @@ -1,5 +1,5 @@ |
26 |
> # portage: Constants |
27 |
> -# Copyright 1998-2018 Gentoo Authors |
28 |
> +# Copyright 1998-2019 Gentoo Authors |
29 |
> # Distributed under the terms of the GNU General Public License v2 |
30 |
> |
31 |
> from __future__ import unicode_literals |
32 |
> @@ -240,13 +240,11 @@ LIVE_ECLASSES = frozenset([ |
33 |
> "bzr", |
34 |
> "cvs", |
35 |
> "darcs", |
36 |
> - "git", |
37 |
> "git-2", |
38 |
> "git-r3", |
39 |
> "golang-vcs", |
40 |
> "mercurial", |
41 |
> "subversion", |
42 |
> - "tla", |
43 |
> ]) |
44 |
> |
45 |
> SUPPORTED_BINPKG_FORMATS = ("tar", "rpm") |
46 |
> |
47 |
|
48 |
Looks good. Please merge. |
49 |
-- |
50 |
Thanks, |
51 |
Zac |