Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: lib/_emerge/
Date: Sun, 01 Mar 2020 02:17:12
Message-Id: 1583028948.69f13236cd4f69451a911a8a0073f9bfe2981f40.zmedico@gentoo
1 commit: 69f13236cd4f69451a911a8a0073f9bfe2981f40
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 1 02:12:49 2020 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 1 02:15:48 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=69f13236
7
8 _PostPhaseCommands: avoid CancelledError in _soname_deps_qa done callback
9
10 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
11
12 lib/_emerge/EbuildPhase.py | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15 diff --git a/lib/_emerge/EbuildPhase.py b/lib/_emerge/EbuildPhase.py
16 index 63d0746da..f6b380e05 100644
17 --- a/lib/_emerge/EbuildPhase.py
18 +++ b/lib/_emerge/EbuildPhase.py
19 @@ -458,7 +458,7 @@ class _PostPhaseCommands(CompositeTask):
20 # This operates on REQUIRES metadata generated by the above function call.
21 future = self._soname_deps_qa()
22 # If an unexpected exception occurs, then this will raise it.
23 - future.add_done_callback(lambda future: future.result())
24 + future.add_done_callback(lambda future: future.cancelled() or future.result())
25 self._start_task(AsyncTaskFuture(future=future), self._default_final_exit)
26 else:
27 self._default_final_exit(task)