portage.const: move list of live eclasses here
authorSebastian Luther <SebastianLuther@gmx.de>
Fri, 29 Nov 2013 20:33:31 +0000 (21:33 +0100)
committerMike Frysinger <vapier@gentoo.org>
Sat, 30 Nov 2013 05:21:59 +0000 (00:21 -0500)
bin/repoman
pym/_emerge/EbuildExecuter.py
pym/portage/_sets/__init__.py
pym/portage/const.py

index 63558fa42cfc50e6c1f0f5d145df25650b7198e5..d1542e96bc9e21d6abda3efd29e8ffb53bb3753e 100755 (executable)
@@ -424,16 +424,7 @@ valid_restrict = frozenset(["binchecks", "bindist",
        "fetch", "installsources", "mirror", "preserve-libs",
        "primaryuri", "splitdebug", "strip", "test", "userpriv"])
 
-live_eclasses = frozenset([
-       "bzr",
-       "cvs",
-       "darcs",
-       "git",
-       "git-2",
-       "mercurial",
-       "subversion",
-       "tla",
-])
+live_eclasses = portage.const.LIVE_ECLASSES
 
 suspect_rdepend = frozenset([
        "app-arch/cabextract",
index cfbc90d0fda9f726126d01b8bc057f428a642c13..5587d4eb0eb8a98d66f989c0b98a63721b322f2f 100644 (file)
@@ -16,16 +16,7 @@ class EbuildExecuter(CompositeTask):
 
        _phases = ("prepare", "configure", "compile", "test", "install")
 
-       _live_eclasses = frozenset([
-               "bzr",
-               "cvs",
-               "darcs",
-               "git",
-               "git-2",
-               "mercurial",
-               "subversion",
-               "tla",
-       ])
+       _live_eclasses = portage.const.LIVE_ECLASSES
 
        def _start(self):
                pkg = self.pkg
index a545dba58de5f87ced23f9b139842c2e35fa9bd1..75d1df7bf62c9aea4604174a42e817b07f2d9aa3 100644 (file)
@@ -140,7 +140,7 @@ class SetConfig(object):
                parser.add_section("live-rebuild")
                parser.set("live-rebuild", "class", "portage.sets.dbapi.VariableSet")
                parser.set("live-rebuild", "variable", "INHERITED")
-               parser.set("live-rebuild", "includes", "bzr cvs darcs git git-2 mercurial subversion tla")
+               parser.set("live-rebuild", "includes", " ".join(sorted(portage.const.LIVE_ECLASSES)))
 
                parser.remove_section("module-rebuild")
                parser.add_section("module-rebuild")
index b2e970eb72f13c554a032c41d3af1eacd742d61b..185867ab0dff5514c24fbe58fd1da3eeb560f674 100644 (file)
@@ -174,6 +174,18 @@ if "PORTAGE_OVERRIDE_EPREFIX" in os.environ:
 
 VCS_DIRS = ("CVS", "RCS", "SCCS", ".bzr", ".git", ".hg", ".svn")
 
+# List of known live eclasses. Keep it in sync with cnf/sets/portage.conf
+LIVE_ECLASSES = frozenset([
+       "bzr",
+       "cvs",
+       "darcs",
+       "git",
+       "git-2",
+       "mercurial",
+       "subversion",
+       "tla",
+])
+
 SUPPORTED_BINPKG_FORMATS = ("tar", "rpm")
 
 # Time formats used in various places like metadata.chk.