From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 2 Sep 2013 19:48:49 +0000 (-0700)
Subject: SpawnProcess: Don't handle FreeBSD fcntl ENOTTY
X-Git-Tag: v2.2.2~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=450ce209bebe9dde62107bf7a867844182010685;p=portage.git

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.
---

diff --git a/pym/_emerge/SpawnProcess.py b/pym/_emerge/SpawnProcess.py
index c7872cab0..021e54616 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,