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 E5E39138331 for ; Sun, 27 May 2018 04:49:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CFE13E08D6; Sun, 27 May 2018 04:49:52 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 A3C4DE08D6 for ; Sun, 27 May 2018 04:49:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 B4A33335CBA for ; Sun, 27 May 2018 04:49:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D930840 for ; Sun, 27 May 2018 04:49:48 +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: <1527396149.b7f94fccf4163364ab7b4c4f0dcd42b8847f03e0.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/PipeReader.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: b7f94fccf4163364ab7b4c4f0dcd42b8847f03e0 X-VCS-Branch: master Date: Sun, 27 May 2018 04:49:48 +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: e7275b06-23f1-4f03-8606-bf1c234f72bb X-Archives-Hash: 995d6ec98f8788df7cfece4bbf1abce7 commit: b7f94fccf4163364ab7b4c4f0dcd42b8847f03e0 Author: Zac Medico gentoo org> AuthorDate: Sun May 27 04:42:29 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun May 27 04:42:29 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=b7f94fcc PiperReader._start: pass file to _array_output_handler pym/_emerge/PipeReader.py | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pym/_emerge/PipeReader.py b/pym/_emerge/PipeReader.py index fc3b7ca55..1aa5ee3bf 100644 --- a/pym/_emerge/PipeReader.py +++ b/pym/_emerge/PipeReader.py @@ -22,11 +22,6 @@ class PipeReader(AbstractPollTask): def _start(self): self._read_data = [] - if self._use_array: - output_handler = self._array_output_handler - else: - output_handler = self._output_handler - for f in self.input_files.values(): fd = f if isinstance(f, int) else f.fileno() fcntl.fcntl(fd, fcntl.F_SETFL, @@ -42,7 +37,11 @@ class PipeReader(AbstractPollTask): fcntl.fcntl(fd, fcntl.F_SETFD, fcntl.fcntl(fd, fcntl.F_GETFD) | fcntl.FD_CLOEXEC) - self.scheduler.add_reader(fd, output_handler, fd) + if self._use_array: + self.scheduler.add_reader(fd, self._array_output_handler, f) + else: + self.scheduler.add_reader(fd, self._output_handler, fd) + self._registered = True def _cancel(self): @@ -72,11 +71,7 @@ class PipeReader(AbstractPollTask): self._async_wait() break - def _array_output_handler(self, fd): - - for f in self.input_files.values(): - if f.fileno() == fd: - break + def _array_output_handler(self, f): while True: data = self._read_array(f)