aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2020-02-29 18:12:49 -0800
committerZac Medico <zmedico@gentoo.org>2020-02-29 18:15:48 -0800
commit69f13236cd4f69451a911a8a0073f9bfe2981f40 (patch)
tree82a25e6773f636caa070415ee86a532b4d3e6505
parentEbuildBuildDir: cancel current tasks for CancelledError (diff)
downloadportage-69f13236cd4f69451a911a8a0073f9bfe2981f40.tar.gz
portage-69f13236cd4f69451a911a8a0073f9bfe2981f40.tar.bz2
portage-69f13236cd4f69451a911a8a0073f9bfe2981f40.zip
_PostPhaseCommands: avoid CancelledError in _soname_deps_qa done callback
Signed-off-by: Zac Medico <zmedico@gentoo.org>
-rw-r--r--lib/_emerge/EbuildPhase.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/_emerge/EbuildPhase.py b/lib/_emerge/EbuildPhase.py
index 63d0746da..f6b380e05 100644
--- a/lib/_emerge/EbuildPhase.py
+++ b/lib/_emerge/EbuildPhase.py
@@ -458,7 +458,7 @@ class _PostPhaseCommands(CompositeTask):
# This operates on REQUIRES metadata generated by the above function call.
future = self._soname_deps_qa()
# If an unexpected exception occurs, then this will raise it.
- future.add_done_callback(lambda future: future.result())
+ future.add_done_callback(lambda future: future.cancelled() or future.result())
self._start_task(AsyncTaskFuture(future=future), self._default_final_exit)
else:
self._default_final_exit(task)