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

["Zac Medico" <zmedico@gentoo.org>]

commit:     309f2cc59e19eab05dfc2e86d1df4fc7ba1be93d
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 22 20:10:30 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Jul 22 20:12:16 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=309f2cc5

MergeProcess: handle cancelled future in _proc_join_done

If the future was cancelled, then avoid a possible ValueError
when accessing proc.exitcode.

Fixes: f587ebf3d492 ("MergeProcess: handle RETURNCODE_POSTINST_FAILURE in _proc_join_done")
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 lib/portage/dbapi/_MergeProcess.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/portage/dbapi/_MergeProcess.py b/lib/portage/dbapi/_MergeProcess.py
index 85deedc18..e89b53555 100644
--- a/lib/portage/dbapi/_MergeProcess.py
+++ b/lib/portage/dbapi/_MergeProcess.py
@@ -199,7 +199,7 @@ class MergeProcess(ForkProcess):
 		"""
 		Extend _proc_join_done to react to RETURNCODE_POSTINST_FAILURE.
 		"""
-		if proc.exitcode == portage.const.RETURNCODE_POSTINST_FAILURE:
+		if not future.cancelled() and proc.exitcode == portage.const.RETURNCODE_POSTINST_FAILURE:
 			self.postinst_failure = True
 			self.returncode = os.EX_OK
 		super(MergeProcess, self)._proc_join_done(proc, future)