| 1 |
Author: zmedico |
| 2 |
Date: 2008-07-04 22:39:57 +0000 (Fri, 04 Jul 2008) |
| 3 |
New Revision: 10933 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Make EbuildBuild inherit from EbuildBuildDir since it's going to hold |
| 9 |
the build dir lock while it runs asynchronously. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/_emerge/__init__.py 2008-07-04 22:19:18 UTC (rev 10932) |
| 15 |
+++ main/trunk/pym/_emerge/__init__.py 2008-07-04 22:39:57 UTC (rev 10933) |
| 16 |
@@ -1698,7 +1698,7 @@ |
| 17 |
class AlreadyLocked(portage.exception.PortageException): |
| 18 |
pass |
| 19 |
|
| 20 |
-class EbuildBuild(SlotObject): |
| 21 |
+class EbuildBuild(EbuildBuildDir): |
| 22 |
|
| 23 |
__slots__ = ("args_set", "find_blockers", |
| 24 |
"ldpath_mtimes", "logger", "opts", |
| 25 |
@@ -1758,9 +1758,8 @@ |
| 26 |
phase="unpack", key=pkg.cpv) |
| 27 |
return retval |
| 28 |
|
| 29 |
- build_dir = EbuildBuildDir(pkg=pkg, settings=settings) |
| 30 |
try: |
| 31 |
- build_dir.lock() |
| 32 |
+ self.lock() |
| 33 |
# Cleaning is triggered before the setup |
| 34 |
# phase, in portage.doebuild(). |
| 35 |
msg = " === (%s of %s) Cleaning (%s::%s)" % \ |
| 36 |
@@ -1831,9 +1830,9 @@ |
| 37 |
if retval != os.EX_OK: |
| 38 |
return retval |
| 39 |
finally: |
| 40 |
- if build_dir.locked: |
| 41 |
+ if self.locked: |
| 42 |
portage.elog.elog_process(pkg.cpv, settings) |
| 43 |
- build_dir.unlock() |
| 44 |
+ self.unlock() |
| 45 |
return os.EX_OK |
| 46 |
|
| 47 |
class EbuildExecuter(SlotObject): |
| 48 |
|
| 49 |
-- |
| 50 |
gentoo-commits@l.g.o mailing list |
Archives