diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-07-04 22:39:57 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-07-04 22:39:57 +0000 |
| commit | 91f77fbc590d73ea150f6f8abb3d218f268bf721 (patch) | |
| tree | eaf47be3257f06294aa73786263a09aa2a04f978 | |
| parent | 839174ff0aca1618a74a9f038ce3cf99dfcc4983 (diff) | |
| download | portage-91f77fbc590d73ea150f6f8abb3d218f268bf721.tar.gz portage-91f77fbc590d73ea150f6f8abb3d218f268bf721.tar.bz2 portage-91f77fbc590d73ea150f6f8abb3d218f268bf721.zip | |
Make EbuildBuild inherit from EbuildBuildDir since it's going to hold
the build dir lock while it runs asynchronously.
svn path=/main/trunk/; revision=10933
| -rw-r--r-- | pym/_emerge/__init__.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 882b4af35..451e30d2e 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -1698,7 +1698,7 @@ class EbuildBuildDir(SlotObject): class AlreadyLocked(portage.exception.PortageException): pass -class EbuildBuild(SlotObject): +class EbuildBuild(EbuildBuildDir): __slots__ = ("args_set", "find_blockers", "ldpath_mtimes", "logger", "opts", @@ -1758,9 +1758,8 @@ class EbuildBuild(SlotObject): phase="unpack", key=pkg.cpv) return retval - build_dir = EbuildBuildDir(pkg=pkg, settings=settings) try: - build_dir.lock() + self.lock() # Cleaning is triggered before the setup # phase, in portage.doebuild(). msg = " === (%s of %s) Cleaning (%s::%s)" % \ @@ -1831,9 +1830,9 @@ class EbuildBuild(SlotObject): if retval != os.EX_OK: return retval finally: - if build_dir.locked: + if self.locked: portage.elog.elog_process(pkg.cpv, settings) - build_dir.unlock() + self.unlock() return os.EX_OK class EbuildExecuter(SlotObject): |