Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: cnf/sets/, bin/, pym/_emerge/
Date: Mon, 14 Feb 2011 15:37:03
Message-Id: 60f55ab3ee1575c2d72870c351b7b336a4900caa.zmedico@gentoo
1 commit: 60f55ab3ee1575c2d72870c351b7b336a4900caa
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 14 15:36:12 2011 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 14 15:36:12 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=60f55ab3
7
8 Recognize git-2.eclass as a live eclass.
9
10 ---
11 bin/repoman | 1 +
12 cnf/sets/portage.conf | 2 +-
13 pym/_emerge/EbuildExecuter.py | 1 +
14 3 files changed, 3 insertions(+), 1 deletions(-)
15
16 diff --git a/bin/repoman b/bin/repoman
17 index 700b247..985350f 100755
18 --- a/bin/repoman
19 +++ b/bin/repoman
20 @@ -442,6 +442,7 @@ live_eclasses = frozenset([
21 "cvs",
22 "darcs",
23 "git",
24 + "git-2",
25 "mercurial",
26 "subversion",
27 "tla",
28
29 diff --git a/cnf/sets/portage.conf b/cnf/sets/portage.conf
30 index 49f25f6..c5c787b 100644
31 --- a/cnf/sets/portage.conf
32 +++ b/cnf/sets/portage.conf
33 @@ -51,7 +51,7 @@ class = portage.sets.libs.PreservedLibraryConsumerSet
34 [live-rebuild]
35 class = portage.sets.dbapi.VariableSet
36 variable = INHERITED
37 -includes = bzr cvs darcs git mercurial subversion tla
38 +includes = bzr cvs darcs git git-2 mercurial subversion tla
39
40 # Installed packages that own files inside /lib/modules.
41 [module-rebuild]
42
43 diff --git a/pym/_emerge/EbuildExecuter.py b/pym/_emerge/EbuildExecuter.py
44 index d3a4dd8..95614de 100644
45 --- a/pym/_emerge/EbuildExecuter.py
46 +++ b/pym/_emerge/EbuildExecuter.py
47 @@ -21,6 +21,7 @@ class EbuildExecuter(CompositeTask):
48 "cvs",
49 "darcs",
50 "git",
51 + "git-2",
52 "mercurial",
53 "subversion",
54 "tla",