From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E3993198005 for ; Sat, 23 Mar 2013 23:00:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0A1BCE07A1; Sat, 23 Mar 2013 23:00:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9C0D1E07A1 for ; Sat, 23 Mar 2013 23:00:44 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7FDF933D3D2 for ; Sat, 23 Mar 2013 23:00:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 0898DE4073 for ; Sat, 23 Mar 2013 23:00:42 +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: <1364079617.751c636d562b1da459b65f18065070d406df2e28.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: 751c636d562b1da459b65f18065070d406df2e28 X-VCS-Branch: master Date: Sat, 23 Mar 2013 23:00:42 +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: 5ffa2453-1d6b-481d-adf2-2236b6267f72 X-Archives-Hash: 9ee00cdb19a8b077092cccf889b5c125 commit: 751c636d562b1da459b65f18065070d406df2e28 Author: Zac Medico gentoo org> AuthorDate: Sat Mar 23 23:00:17 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Mar 23 23:00:17 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=751c636d SubProcess: re-organize Darwin/fcntl logic --- pym/_emerge/SpawnProcess.py | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pym/_emerge/SpawnProcess.py b/pym/_emerge/SpawnProcess.py index c549884..25859a9 100644 --- a/pym/_emerge/SpawnProcess.py +++ b/pym/_emerge/SpawnProcess.py @@ -7,18 +7,17 @@ except ImportError: # http://bugs.jython.org/issue1074 fcntl = None -from _emerge.SubProcess import SubProcess +import platform import sys + +from _emerge.SubProcess import SubProcess import portage from portage import os from portage.const import BASH_BINARY from portage.util._async.PipeLogger import PipeLogger -# https://bugs.gentoo.org/show_bug.cgi?id=456296 -import platform -if platform.system() in ("Darwin",): - # disable FD_CLOEXEC on stdout, breaks horribly - fcntl = None +# On Darwin, FD_CLOEXEC triggers errno 35 for stdout (bug #456296) +_disable_cloexec_stdout = platform.system() in ("Darwin",) class SpawnProcess(SubProcess): @@ -120,7 +119,7 @@ class SpawnProcess(SubProcess): stdout_fd = None if can_log and not self.background: stdout_fd = os.dup(fd_pipes_orig[1]) - if fcntl is not None: + if fcntl is not None and not _disable_cloexec_stdout: try: fcntl.FD_CLOEXEC except AttributeError: