summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-02-14 07:36:12 -0800
committerZac Medico <zmedico@gentoo.org>2011-02-14 07:59:38 -0800
commit426d0e6d6832d965f4014299d32a5cbe088d9db0 (patch)
tree7f2de472c5d153e64fa219f22c2f1d114108f992
parentb040c7ed4a06632d12f20d2ad88f88f7c3d76461 (diff)
downloadportage-426d0e6d6832d965f4014299d32a5cbe088d9db0.tar.gz
portage-426d0e6d6832d965f4014299d32a5cbe088d9db0.tar.bz2
portage-426d0e6d6832d965f4014299d32a5cbe088d9db0.zip
Recognize git-2.eclass as a live eclass.
-rwxr-xr-xbin/repoman1
-rw-r--r--cnf/sets/portage.conf2
-rw-r--r--pym/_emerge/EbuildExecuter.py1
3 files changed, 3 insertions, 1 deletions
diff --git a/bin/repoman b/bin/repoman
index c049e70d1..b694b6ca3 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -442,6 +442,7 @@ live_eclasses = frozenset([
"cvs",
"darcs",
"git",
+ "git-2",
"mercurial",
"subversion",
"tla",
diff --git a/cnf/sets/portage.conf b/cnf/sets/portage.conf
index 49f25f666..c5c787bb5 100644
--- a/cnf/sets/portage.conf
+++ b/cnf/sets/portage.conf
@@ -51,7 +51,7 @@ class = portage.sets.libs.PreservedLibraryConsumerSet
[live-rebuild]
class = portage.sets.dbapi.VariableSet
variable = INHERITED
-includes = bzr cvs darcs git mercurial subversion tla
+includes = bzr cvs darcs git git-2 mercurial subversion tla
# Installed packages that own files inside /lib/modules.
[module-rebuild]
diff --git a/pym/_emerge/EbuildExecuter.py b/pym/_emerge/EbuildExecuter.py
index d3a4dd8dd..95614de87 100644
--- a/pym/_emerge/EbuildExecuter.py
+++ b/pym/_emerge/EbuildExecuter.py
@@ -21,6 +21,7 @@ class EbuildExecuter(CompositeTask):
"cvs",
"darcs",
"git",
+ "git-2",
"mercurial",
"subversion",
"tla",