[gentoo-commits] proj/portage:master commit in: lib/_emerge/

[Zac Medico]

commit:     69f13236cd4f69451a911a8a0073f9bfe2981f40
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  1 02:12:49 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Mar  1 02:15:48 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=69f13236

_PostPhaseCommands: avoid CancelledError in _soname_deps_qa done callback

Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 lib/_emerge/EbuildPhase.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)