Catch errors when duping stdin

Fixes #6657
pull/6622/merge
James Cammarata 11 years ago
parent 06920b2e47
commit f23bb344aa

@ -507,10 +507,15 @@ class Runner(object):
fileno = None fileno = None
try: try:
self._new_stdin = new_stdin
if not new_stdin and fileno is not None: if not new_stdin and fileno is not None:
try:
self._new_stdin = os.fdopen(os.dup(fileno)) self._new_stdin = os.fdopen(os.dup(fileno))
else: except:
self._new_stdin = new_stdin # couldn't dupe stdin, most likely because it's
# not a valid file descriptor, so we just rely on
# using the one that was passed in
pass
exec_rc = self._executor_internal(host, new_stdin) exec_rc = self._executor_internal(host, new_stdin)
if type(exec_rc) != ReturnData: if type(exec_rc) != ReturnData:
@ -1094,10 +1099,15 @@ class Runner(object):
workers = [] workers = []
for i in range(self.forks): for i in range(self.forks):
new_stdin = None
if fileno is not None: if fileno is not None:
try:
new_stdin = os.fdopen(os.dup(fileno)) new_stdin = os.fdopen(os.dup(fileno))
else: except:
new_stdin = None # couldn't dupe stdin, most likely because it's
# not a valid file descriptor, so we just rely on
# using the one that was passed in
pass
prc = multiprocessing.Process(target=_executor_hook, prc = multiprocessing.Process(target=_executor_hook,
args=(job_queue, result_queue, new_stdin)) args=(job_queue, result_queue, new_stdin))
prc.start() prc.start()

Loading…
Cancel
Save