equal
deleted
inserted
replaced
836 except KeyboardInterrupt: |
836 except KeyboardInterrupt: |
837 vlog('# Handling keyboard interrupt') |
837 vlog('# Handling keyboard interrupt') |
838 cleanup() |
838 cleanup() |
839 raise |
839 raise |
840 |
840 |
841 ret = proc.wait() |
841 try: |
|
842 ret = proc.wait() |
|
843 except OSError: |
|
844 # Py2.4 seems to have a race here |
|
845 pass |
842 if wifexited(ret): |
846 if wifexited(ret): |
843 ret = os.WEXITSTATUS(ret) |
847 ret = os.WEXITSTATUS(ret) |
844 |
848 |
845 if proc.timeout: |
849 if proc.timeout: |
846 ret = 'timeout' |
850 ret = 'timeout' |