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/_emerge/AsynchronousLock.py | |
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/_emerge/AsynchronousLock.py')
-rw-r--r-- | pym/_emerge/AsynchronousLock.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/pym/_emerge/AsynchronousLock.py b/pym/_emerge/AsynchronousLock.py index 2de1acdcf..fd66a9455 100644 --- a/pym/_emerge/AsynchronousLock.py +++ b/pym/_emerge/AsynchronousLock.py @@ -1,4 +1,4 @@ -# Copyright 2010-2012 Gentoo Foundation +# Copyright 2010-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 import dummy_threading @@ -164,8 +164,17 @@ class _LockProcess(AbstractPollTask): self._files = {} self._files['pipe_in'] = in_pr self._files['pipe_out'] = out_pw + + fcntl_flags = os.O_NONBLOCK + try: + fcntl.FD_CLOEXEC + except AttributeError: + pass + else: + fcntl_flags |= fcntl.FD_CLOEXEC + fcntl.fcntl(in_pr, fcntl.F_SETFL, - fcntl.fcntl(in_pr, fcntl.F_GETFL) | os.O_NONBLOCK) + fcntl.fcntl(in_pr, fcntl.F_GETFL) | fcntl_flags) self._reg_id = self.scheduler.io_add_watch(in_pr, self.scheduler.IO_IN, self._output_handler) self._registered = True |