1 |
Author: zmedico |
2 |
Date: 2008-06-28 06:10:23 +0000 (Sat, 28 Jun 2008) |
3 |
New Revision: 10831 |
4 |
|
5 |
Modified: |
6 |
main/trunk/pym/_emerge/__init__.py |
7 |
Log: |
8 |
Split out an EbuildBuild class. |
9 |
|
10 |
|
11 |
Modified: main/trunk/pym/_emerge/__init__.py |
12 |
=================================================================== |
13 |
--- main/trunk/pym/_emerge/__init__.py 2008-06-28 06:06:10 UTC (rev 10830) |
14 |
+++ main/trunk/pym/_emerge/__init__.py 2008-06-28 06:10:23 UTC (rev 10831) |
15 |
@@ -1451,6 +1451,30 @@ |
16 |
mydbapi=portdb, tree="porttree") |
17 |
return retval |
18 |
|
19 |
+class EbuildBuild(Task): |
20 |
+ |
21 |
+ __slots__ = ("ldpath_mtimes", |
22 |
+ "pkg", "pretend", "settings") |
23 |
+ |
24 |
+ def _get_hash_key(self): |
25 |
+ hash_key = getattr(self, "_hash_key", None) |
26 |
+ if hash_key is None: |
27 |
+ self._hash_key = ("EbuildBuild", self.pkg._get_hash_key()) |
28 |
+ return self._hash_key |
29 |
+ |
30 |
+ def execute(self): |
31 |
+ root_config = self.pkg.root_config |
32 |
+ portdb = root_config.trees["porttree"].dbapi |
33 |
+ vartree = root_config.trees["vartree"] |
34 |
+ ebuild_path = portdb.findname(self.pkg.cpv) |
35 |
+ debug = self.settings.get("PORTAGE_DEBUG") == "1" |
36 |
+ |
37 |
+ retval = portage.doebuild(ebuild_path, "install", |
38 |
+ root_config.root, self.settings, debug, vartree=vartree, |
39 |
+ mydbapi=portdb, tree="porttree", |
40 |
+ prev_mtimes=self.ldpath_mtimes) |
41 |
+ return retval |
42 |
+ |
43 |
class EbuildMerge(Task): |
44 |
|
45 |
__slots__ = ("find_blockers", "ldpath_mtimes", |
46 |
@@ -6478,10 +6502,10 @@ |
47 |
short_msg = "emerge: (%s of %s) %s Compile" % \ |
48 |
(mergecount, len(mymergelist), pkg_key) |
49 |
emergelog(xterm_titles, msg, short_msg=short_msg) |
50 |
- retval = portage.doebuild(y, "install", myroot, |
51 |
- pkgsettings, self.edebug, vartree=vartree, |
52 |
- mydbapi=portdb, tree="porttree", |
53 |
- prev_mtimes=ldpath_mtimes) |
54 |
+ |
55 |
+ build = EbuildBuild(ldpath_mtimes=ldpath_mtimes, |
56 |
+ pkg=pkg, pretend=pretend, settings=pkgsettings) |
57 |
+ retval = build.execute() |
58 |
if retval != os.EX_OK: |
59 |
raise self._pkg_failure(retval) |
60 |
|
61 |
|
62 |
-- |
63 |
gentoo-commits@l.g.o mailing list |