From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A7093138334 for ; Sat, 23 Jun 2018 22:15:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A9234E0863; Sat, 23 Jun 2018 22:15:29 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 750BBE0863 for ; Sat, 23 Jun 2018 22:15:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D38C9335C07 for ; Sat, 23 Jun 2018 22:15:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5E1A32A1 for ; Sat, 23 Jun 2018 22:15:24 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1529792113.a9a62e57194ccefce1ecabb9df761993f35f53be.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/SpawnProcess.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: a9a62e57194ccefce1ecabb9df761993f35f53be X-VCS-Branch: master Date: Sat, 23 Jun 2018 22:15:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 94b84c43-3df9-49ee-961c-cc9fdd652ba4 X-Archives-Hash: d76d660d5475a81a42706486d02bfbe6 commit: a9a62e57194ccefce1ecabb9df761993f35f53be Author: Zac Medico gentoo org> AuthorDate: Sat Jun 23 22:03:35 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Jun 23 22:15:13 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=a9a62e57 SpawnProcess._unregister: cancel PipeLogger (bug 658806) If the PipeLogger has not closed itself before the _unregister method has been called, then it must be cancelled so that it will close the log immediately. This fixes the case reported in bug 658806, where an unclosed PipeLogger instance left the log file with a temporarily incomplete gzip stream. Bug: https://bugs.gentoo.org/658806 pym/_emerge/SpawnProcess.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pym/_emerge/SpawnProcess.py b/pym/_emerge/SpawnProcess.py index f592c543d..cd535d143 100644 --- a/pym/_emerge/SpawnProcess.py +++ b/pym/_emerge/SpawnProcess.py @@ -176,6 +176,9 @@ class SpawnProcess(SubProcess): if self.cgroup is not None: self._cgroup_cleanup() self.cgroup = None + if self._pipe_logger is not None: + self._pipe_logger.cancel() + self._pipe_logger = None def _cancel(self): SubProcess._cancel(self)