diff options
author | Zac Medico <zmedico@gentoo.org> | 2011-12-13 20:06:10 -0800 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2011-12-13 20:06:10 -0800 |
commit | 9fa915eef028c96b8cde3876fb8bb299c03f9a62 (patch) | |
tree | a5f73e00ac4b5134af371ed29ce871d967d7b43b | |
parent | c11b7c487c518f9a2aceaddbe119a70877053cf5 (diff) | |
download | portage-9fa915eef028c96b8cde3876fb8bb299c03f9a62.tar.gz portage-9fa915eef028c96b8cde3876fb8bb299c03f9a62.tar.bz2 portage-9fa915eef028c96b8cde3876fb8bb299c03f9a62.zip |
ebuils-ipc.py: _exit in finally block after fork
-rwxr-xr-x | bin/ebuild-ipc.py | 38 |
1 files changed, 27 insertions, 11 deletions
diff --git a/bin/ebuild-ipc.py b/bin/ebuild-ipc.py index 68ad985b6..372585f7b 100755 --- a/bin/ebuild-ipc.py +++ b/bin/ebuild-ipc.py @@ -13,6 +13,7 @@ import select import signal import sys import time +import traceback def debug_signal(signum, frame): import pdb @@ -228,14 +229,22 @@ class EbuildIpc(object): pid = os.fork() if pid == 0: - os.close(pr) - - # File streams are in unbuffered mode since we do atomic - # read and write of whole pickles. - output_file = open(self.ipc_in_fifo, 'wb', 0) - output_file.write(pickle.dumps(args)) - output_file.close() - os._exit(os.EX_OK) + retval = 1 + try: + os.close(pr) + + # File streams are in unbuffered mode since we do atomic + # read and write of whole pickles. + output_file = open(self.ipc_in_fifo, 'wb', 0) + output_file.write(pickle.dumps(args)) + output_file.close() + retval = os.EX_OK + except SystemExit: + raise + except: + traceback.print_exc() + finally: + os._exit(retval) os.close(pw) @@ -258,9 +267,16 @@ class EbuildIpc(object): pid = os.fork() if pid == 0: - os.close(pr) - retval = self._receive_reply(input_fd) - os._exit(retval) + retval = 1 + try: + os.close(pr) + retval = self._receive_reply(input_fd) + except SystemExit: + raise + except: + traceback.print_exc() + finally: + os._exit(retval) os.close(pw) retval = self._wait(pid, pr, portage.localization._('during read')) |