| 1 |
commit: 450ce209bebe9dde62107bf7a867844182010685 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 2 19:48:49 2013 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 2 19:48:49 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=450ce209 |
| 7 |
|
| 8 |
SpawnProcess: Don't handle FreeBSD fcntl ENOTTY |
| 9 |
|
| 10 |
This error does not occur since the fcntl call was fixed to properly |
| 11 |
use the F_GETFD/F_SETFD commands in commit |
| 12 |
30c652a9db1014fc720f7d6055520a07b731c984. |
| 13 |
|
| 14 |
--- |
| 15 |
pym/_emerge/SpawnProcess.py | 13 +++---------- |
| 16 |
1 file changed, 3 insertions(+), 10 deletions(-) |
| 17 |
|
| 18 |
diff --git a/pym/_emerge/SpawnProcess.py b/pym/_emerge/SpawnProcess.py |
| 19 |
index c7872ca..021e546 100644 |
| 20 |
--- a/pym/_emerge/SpawnProcess.py |
| 21 |
+++ b/pym/_emerge/SpawnProcess.py |
| 22 |
@@ -132,16 +132,9 @@ class SpawnProcess(SubProcess): |
| 23 |
except AttributeError: |
| 24 |
pass |
| 25 |
else: |
| 26 |
- try: |
| 27 |
- fcntl.fcntl(stdout_fd, fcntl.F_SETFD, |
| 28 |
- fcntl.fcntl(stdout_fd, |
| 29 |
- fcntl.F_GETFD) | fcntl.FD_CLOEXEC) |
| 30 |
- except IOError: |
| 31 |
- # FreeBSD may return "Inappropriate ioctl for device" |
| 32 |
- # error here (ENOTTY). TODO: Test this again now that |
| 33 |
- # it's been fixed to use F_GETFD/F_SETFD instead of |
| 34 |
- # F_GETFL/F_SETFL. |
| 35 |
- pass |
| 36 |
+ fcntl.fcntl(stdout_fd, fcntl.F_SETFD, |
| 37 |
+ fcntl.fcntl(stdout_fd, |
| 38 |
+ fcntl.F_GETFD) | fcntl.FD_CLOEXEC) |
| 39 |
|
| 40 |
self._pipe_logger = PipeLogger(background=self.background, |
| 41 |
scheduler=self.scheduler, input_fd=master_fd, |
Archives