Author: bugman Date: Thu Aug 25 12:24:18 2011 New Revision: 14441 URL: http://svn.gna.org/viewcvs/relax?rev=14441&view=rev Log: Reverted r14437 as _sys_exit is necessary for the mpi4py processor module. The command used was: svn merge -r14437:14436 . Modified: 1.3/multi/mpi4py_processor.py Modified: 1.3/multi/mpi4py_processor.py URL: http://svn.gna.org/viewcvs/relax/1.3/multi/mpi4py_processor.py?rev=14441&r1=14440&r2=14441&view=diff ============================================================================== --- 1.3/multi/mpi4py_processor.py (original) +++ 1.3/multi/mpi4py_processor.py Thu Aug 25 12:24:18 2011 @@ -39,6 +39,9 @@ from multi.multi_processor_base import Multi_processor, Too_few_slaves_exception +# save original sys.exit to call after wrapper +_sys_exit = sys.exit + in_main_loop = False @@ -79,7 +82,7 @@ # Execution on the master. else: exit_mpi() - sys.exit(status) + _sys_exit(status) def exit_mpi():