diff options
| author | Zac Medico <zmedico@gentoo.org> | 2013-01-03 20:16:17 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2013-01-03 20:16:17 -0800 |
| commit | 67f618433366316dca8e8c5cdc08e106e268c81a (patch) | |
| tree | ec451083ab5ef091b0b4d64288782cb48e2535ed /pym/portage/dbapi | |
| parent | 65a5f14f8b76a250f5df42e57512bfc140543622 (diff) | |
| download | portage-67f618433366316dca8e8c5cdc08e106e268c81a.tar.gz portage-67f618433366316dca8e8c5cdc08e106e268c81a.tar.bz2 portage-67f618433366316dca8e8c5cdc08e106e268c81a.zip | |
Enable FD_CLOEXEC for non-blocking pipes.
Diffstat (limited to 'pym/portage/dbapi')
| -rw-r--r-- | pym/portage/dbapi/_MergeProcess.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pym/portage/dbapi/_MergeProcess.py b/pym/portage/dbapi/_MergeProcess.py index e2534cf9d..1442d56ac 100644 --- a/pym/portage/dbapi/_MergeProcess.py +++ b/pym/portage/dbapi/_MergeProcess.py @@ -114,8 +114,17 @@ class MergeProcess(ForkProcess): """ elog_reader_fd, elog_writer_fd = os.pipe() + + fcntl_flags = os.O_NONBLOCK + try: + fcntl.FD_CLOEXEC + except AttributeError: + pass + else: + fcntl_flags |= fcntl.FD_CLOEXEC + fcntl.fcntl(elog_reader_fd, fcntl.F_SETFL, - fcntl.fcntl(elog_reader_fd, fcntl.F_GETFL) | os.O_NONBLOCK) + fcntl.fcntl(elog_reader_fd, fcntl.F_GETFL) | fcntl_flags) blockers = None if self.blockers is not None: # Query blockers in the main process, since closing |