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 1069B1381F3 for ; Mon, 2 Sep 2013 19:49:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A2794E0BF8; Mon, 2 Sep 2013 19:49:21 +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 3711CE0BF8 for ; Mon, 2 Sep 2013 19:49:21 +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 50C2433ECC0 for ; Mon, 2 Sep 2013 19:49:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 06FEFE468F for ; Mon, 2 Sep 2013 19:49:19 +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: <1378151329.450ce209bebe9dde62107bf7a867844182010685.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: 450ce209bebe9dde62107bf7a867844182010685 X-VCS-Branch: master Date: Mon, 2 Sep 2013 19:49:19 +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: 4545d8a1-ef6e-45d2-9459-ce2da11990ae X-Archives-Hash: cf1ac37bd1a755724e575a8c26afbc4a commit: 450ce209bebe9dde62107bf7a867844182010685 Author: Zac Medico gentoo org> AuthorDate: Mon Sep 2 19:48:49 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Sep 2 19:48:49 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=450ce209 SpawnProcess: Don't handle FreeBSD fcntl ENOTTY This error does not occur since the fcntl call was fixed to properly use the F_GETFD/F_SETFD commands in commit 30c652a9db1014fc720f7d6055520a07b731c984. --- pym/_emerge/SpawnProcess.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pym/_emerge/SpawnProcess.py b/pym/_emerge/SpawnProcess.py index c7872ca..021e546 100644 --- a/pym/_emerge/SpawnProcess.py +++ b/pym/_emerge/SpawnProcess.py @@ -132,16 +132,9 @@ class SpawnProcess(SubProcess): except AttributeError: pass else: - try: - fcntl.fcntl(stdout_fd, fcntl.F_SETFD, - fcntl.fcntl(stdout_fd, - fcntl.F_GETFD) | fcntl.FD_CLOEXEC) - except IOError: - # FreeBSD may return "Inappropriate ioctl for device" - # error here (ENOTTY). TODO: Test this again now that - # it's been fixed to use F_GETFD/F_SETFD instead of - # F_GETFL/F_SETFL. - pass + fcntl.fcntl(stdout_fd, fcntl.F_SETFD, + fcntl.fcntl(stdout_fd, + fcntl.F_GETFD) | fcntl.FD_CLOEXEC) self._pipe_logger = PipeLogger(background=self.background, scheduler=self.scheduler, input_fd=master_fd,