1 |
commit: 25ce074611a6c7ac2b80f0e525d3ab91e822ed93 |
2 |
Author: Sebastian Luther <SebastianLuther <AT> gmx <DOT> de> |
3 |
AuthorDate: Fri Nov 29 20:33:31 2013 +0000 |
4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Nov 30 05:21:59 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=25ce0746 |
7 |
|
8 |
portage.const: move list of live eclasses here |
9 |
|
10 |
--- |
11 |
bin/repoman | 11 +---------- |
12 |
pym/_emerge/EbuildExecuter.py | 11 +---------- |
13 |
pym/portage/_sets/__init__.py | 2 +- |
14 |
pym/portage/const.py | 12 ++++++++++++ |
15 |
4 files changed, 15 insertions(+), 21 deletions(-) |
16 |
|
17 |
diff --git a/bin/repoman b/bin/repoman |
18 |
index 63558fa..d1542e9 100755 |
19 |
--- a/bin/repoman |
20 |
+++ b/bin/repoman |
21 |
@@ -424,16 +424,7 @@ valid_restrict = frozenset(["binchecks", "bindist", |
22 |
"fetch", "installsources", "mirror", "preserve-libs", |
23 |
"primaryuri", "splitdebug", "strip", "test", "userpriv"]) |
24 |
|
25 |
-live_eclasses = frozenset([ |
26 |
- "bzr", |
27 |
- "cvs", |
28 |
- "darcs", |
29 |
- "git", |
30 |
- "git-2", |
31 |
- "mercurial", |
32 |
- "subversion", |
33 |
- "tla", |
34 |
-]) |
35 |
+live_eclasses = portage.const.LIVE_ECLASSES |
36 |
|
37 |
suspect_rdepend = frozenset([ |
38 |
"app-arch/cabextract", |
39 |
|
40 |
diff --git a/pym/_emerge/EbuildExecuter.py b/pym/_emerge/EbuildExecuter.py |
41 |
index cfbc90d..5587d4e 100644 |
42 |
--- a/pym/_emerge/EbuildExecuter.py |
43 |
+++ b/pym/_emerge/EbuildExecuter.py |
44 |
@@ -16,16 +16,7 @@ class EbuildExecuter(CompositeTask): |
45 |
|
46 |
_phases = ("prepare", "configure", "compile", "test", "install") |
47 |
|
48 |
- _live_eclasses = frozenset([ |
49 |
- "bzr", |
50 |
- "cvs", |
51 |
- "darcs", |
52 |
- "git", |
53 |
- "git-2", |
54 |
- "mercurial", |
55 |
- "subversion", |
56 |
- "tla", |
57 |
- ]) |
58 |
+ _live_eclasses = portage.const.LIVE_ECLASSES |
59 |
|
60 |
def _start(self): |
61 |
pkg = self.pkg |
62 |
|
63 |
diff --git a/pym/portage/_sets/__init__.py b/pym/portage/_sets/__init__.py |
64 |
index a545dba..75d1df7 100644 |
65 |
--- a/pym/portage/_sets/__init__.py |
66 |
+++ b/pym/portage/_sets/__init__.py |
67 |
@@ -140,7 +140,7 @@ class SetConfig(object): |
68 |
parser.add_section("live-rebuild") |
69 |
parser.set("live-rebuild", "class", "portage.sets.dbapi.VariableSet") |
70 |
parser.set("live-rebuild", "variable", "INHERITED") |
71 |
- parser.set("live-rebuild", "includes", "bzr cvs darcs git git-2 mercurial subversion tla") |
72 |
+ parser.set("live-rebuild", "includes", " ".join(sorted(portage.const.LIVE_ECLASSES))) |
73 |
|
74 |
parser.remove_section("module-rebuild") |
75 |
parser.add_section("module-rebuild") |
76 |
|
77 |
diff --git a/pym/portage/const.py b/pym/portage/const.py |
78 |
index b2e970e..185867a 100644 |
79 |
--- a/pym/portage/const.py |
80 |
+++ b/pym/portage/const.py |
81 |
@@ -174,6 +174,18 @@ if "PORTAGE_OVERRIDE_EPREFIX" in os.environ: |
82 |
|
83 |
VCS_DIRS = ("CVS", "RCS", "SCCS", ".bzr", ".git", ".hg", ".svn") |
84 |
|
85 |
+# List of known live eclasses. Keep it in sync with cnf/sets/portage.conf |
86 |
+LIVE_ECLASSES = frozenset([ |
87 |
+ "bzr", |
88 |
+ "cvs", |
89 |
+ "darcs", |
90 |
+ "git", |
91 |
+ "git-2", |
92 |
+ "mercurial", |
93 |
+ "subversion", |
94 |
+ "tla", |
95 |
+]) |
96 |
+ |
97 |
SUPPORTED_BINPKG_FORMATS = ("tar", "rpm") |
98 |
|
99 |
# Time formats used in various places like metadata.chk. |