Commit f2203126 authored by Florent Guillaume's avatar Florent Guillaume

Merged r40547 from 2.9 branch:

Collector #1904: On Mac OS X avoid a spurious OSError when zopectl exits.
parent c00164c0
......@@ -26,6 +26,9 @@ Zope Changes
Bugs Fixed
- Collector #1904: On Mac OS X avoid a spurious OSError when
zopectl exits.
- CopySupport: Reverted workaround in '_verifyObjectPaste'.
'checkPermission' now respects proxy roles, so the warkaround
introduced to fix http://www.zope.org/Collectors/Zope/78 is no longer
......
......@@ -310,5 +310,13 @@ if __name__ == "__main__":
# If it is not reset, 'os.wait[pid]' can non-deterministically fail.
# Thus, use a way such that "SIGCHLD" is definitely reset in children.
#signal.signal(signal.SIGCHLD, signal.SIG_IGN)
if os.uname()[0] != 'Darwin':
# On Mac OS X, setting up a signal handler causes waitpid to
# raise EINTR, which is not preventable via the Python signal
# handler API and can't be dealt with properly as we can't pass
# the SA_RESTART to the signal API. Since Mac OS X doesn't
# appear to clutter up the process table with zombies if
# SIGCHILD is unset, just don't bother registering a SIGCHILD
# signal handler at all.
signal.signal(signal.SIGCHLD, _ignoreSIGCHLD)
main()
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment