| 1 |
Author: zmedico |
| 2 |
Date: 2008-06-28 05:24:13 +0000 (Sat, 28 Jun 2008) |
| 3 |
New Revision: 10829 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Split out an EbuildMerge class. |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/_emerge/__init__.py 2008-06-28 05:04:19 UTC (rev 10828) |
| 14 |
+++ main/trunk/pym/_emerge/__init__.py 2008-06-28 05:24:13 UTC (rev 10829) |
| 15 |
@@ -1451,6 +1451,30 @@ |
| 16 |
mydbapi=portdb, tree="porttree") |
| 17 |
return retval |
| 18 |
|
| 19 |
+class EbuildMerge(Task): |
| 20 |
+ |
| 21 |
+ __slots__ = ("find_blockers", "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 = ("EbuildMerge", self.pkg._get_hash_key()) |
| 28 |
+ return self._hash_key |
| 29 |
+ |
| 30 |
+ def execute(self): |
| 31 |
+ root_config = self.pkg.root_config |
| 32 |
+ settings = self.settings |
| 33 |
+ retval = portage.merge(settings["CATEGORY"], |
| 34 |
+ settings["PF"], settings["D"], |
| 35 |
+ os.path.join(settings["PORTAGE_BUILDDIR"], |
| 36 |
+ "build-info"), root_config.root, settings, |
| 37 |
+ myebuild=settings["EBUILD"], |
| 38 |
+ mytree="porttree", mydbapi=root_config.trees["porttree"].dbapi, |
| 39 |
+ vartree=vartree, prev_mtimes=self.ldpath_mtimes, |
| 40 |
+ blockers=self.find_blockers) |
| 41 |
+ return retval |
| 42 |
+ |
| 43 |
class BinpkgFetcher(Task): |
| 44 |
|
| 45 |
__slots__ = ("use_locks", "pkg", "pretend", |
| 46 |
@@ -6460,14 +6484,12 @@ |
| 47 |
if retval != os.EX_OK: |
| 48 |
raise self._pkg_failure(retval) |
| 49 |
|
| 50 |
- retval = portage.merge(pkgsettings["CATEGORY"], |
| 51 |
- pkgsettings["PF"], pkgsettings["D"], |
| 52 |
- os.path.join(pkgsettings["PORTAGE_BUILDDIR"], |
| 53 |
- "build-info"), myroot, pkgsettings, |
| 54 |
- myebuild=pkgsettings["EBUILD"], |
| 55 |
- mytree="porttree", mydbapi=portdb, |
| 56 |
- vartree=vartree, prev_mtimes=ldpath_mtimes, |
| 57 |
- blockers=self._find_blockers(pkg)) |
| 58 |
+ merge = EbuildMerge( |
| 59 |
+ find_blockers=self._find_blockers(pkg), |
| 60 |
+ ldpath_mtimes=ldpath_mtimes, |
| 61 |
+ pkg=pkg, pretend=pretend, settings=pkgsettings) |
| 62 |
+ retval = merge.execute() |
| 63 |
+ |
| 64 |
if retval != os.EX_OK: |
| 65 |
raise self._pkg_failure(retval) |
| 66 |
finally: |
| 67 |
|
| 68 |
-- |
| 69 |
gentoo-commits@l.g.o mailing list |
Archives