SpawnProcess: cancel pipe_logger after async_start CancelledError

Signed-off-by: Zac Medico <zmedico@gentoo.org>
zmedico · Feb 29, 2020 · d331f03 · d331f03
1 parent 6eb6500
commit d331f03
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/lib/_emerge/SpawnProcess.py b/lib/_emerge/SpawnProcess.py
@@ -147,7 +147,12 @@ def _async_start(self):
 			log_file_path=log_file_path,
 			stdout_fd=stdout_fd)
 		self._registered = True
-		yield pipe_logger.async_start()
+		try:
+			yield pipe_logger.async_start()
+		except asyncio.CancelledError:
+			if pipe_logger.poll() is None:
+				pipe_logger.cancel()
+			raise
 
 		self._main_task = asyncio.ensure_future(
 			self._main(pipe_logger), loop=self.scheduler)