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 5C1B2138330 for ; Sun, 27 May 2018 04:26:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1CE9DE0898; Sun, 27 May 2018 04:26:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 EB55EE0898 for ; Sun, 27 May 2018 04:26:09 +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 56599335CB6 for ; Sun, 27 May 2018 04:26:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9373427A for ; Sun, 27 May 2018 04:26:06 +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: <1527395140.d329d1142df1662db452642ac719595d15a0d5bd.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: d329d1142df1662db452642ac719595d15a0d5bd X-VCS-Branch: master Date: Sun, 27 May 2018 04:26:06 +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: 7008a05c-daa9-4e31-ac9b-e69788733412 X-Archives-Hash: 9c3ec4c38ada4ab284ed310a5d46a25d commit: d329d1142df1662db452642ac719595d15a0d5bd Author: Zac Medico gentoo org> AuthorDate: Sun May 27 04:24:06 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun May 27 04:25:40 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=d329d114 PiperReader._start: handle case where fd is 0 pym/_emerge/PipeReader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pym/_emerge/PipeReader.py b/pym/_emerge/PipeReader.py index 151be94ea..fc3b7ca55 100644 --- a/pym/_emerge/PipeReader.py +++ b/pym/_emerge/PipeReader.py @@ -28,7 +28,7 @@ class PipeReader(AbstractPollTask): output_handler = self._output_handler for f in self.input_files.values(): - fd = isinstance(f, int) and f or f.fileno() + fd = f if isinstance(f, int) else f.fileno() fcntl.fcntl(fd, fcntl.F_SETFL, fcntl.fcntl(fd, fcntl.F_GETFL) | os.O_NONBLOCK)