Asynchronously lock the build directory, and use AsyncTaskFuture to fit the resulting future into the CompositeTask framework that PackageUninstall uses.
Bug: https://bugs.gentoo.org/614112 --- pym/_emerge/PackageUninstall.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pym/_emerge/PackageUninstall.py b/pym/_emerge/PackageUninstall.py index 8f19e38e4..3fe1fb0a6 100644 --- a/pym/_emerge/PackageUninstall.py +++ b/pym/_emerge/PackageUninstall.py @@ -55,8 +55,13 @@ class PackageUninstall(CompositeTask): self._builddir_lock = EbuildBuildDir( scheduler=self.scheduler, settings=self.settings) - self._builddir_lock.lock() + self._start_task( + AsyncTaskFuture(future=self._builddir_lock.async_lock()), + self._start_unmerge) + def _start_unmerge(self, lock_task): + self._assert_current(lock_task) + lock_task.future.result() portage.prepare_build_dirs( settings=self.settings, cleanup=True) @@ -74,6 +79,7 @@ class PackageUninstall(CompositeTask): noiselevel=-1) self._emergelog("=== Unmerging... (%s)" % (self.pkg.cpv,)) + cat, pf = portage.catsplit(self.pkg.cpv) unmerge_task = MergeProcess( mycat=cat, mypkg=pf, settings=self.settings, treetype="vartree", vartree=self.pkg.root_config.trees["vartree"], -- 2.13.6
