cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Making the exception caught during os.dup of stdin explicit

Browse source 
Related to f23bb34
This commit is contained in:
James Cammarata 2014-03-31 13:50:23 -05:00
parent f23bb344aa
commit b9c044b8c9
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/runner/__init__.py
View file

@ -511,7 +511,7 @@ class Runner(object):
if not new_stdin and fileno is not None: if not new_stdin and fileno is not None:
try: try:
self._new_stdin = os.fdopen(os.dup(fileno)) self._new_stdin = os.fdopen(os.dup(fileno))
except: except OSError, e:
# couldn't dupe stdin, most likely because it's # couldn't dupe stdin, most likely because it's
# not a valid file descriptor, so we just rely on # not a valid file descriptor, so we just rely on
# using the one that was passed in # using the one that was passed in
@ -1103,7 +1103,7 @@ class Runner(object):
if fileno is not None: if fileno is not None:
try: try:
new_stdin = os.fdopen(os.dup(fileno)) new_stdin = os.fdopen(os.dup(fileno))
except: except OSError, e:
# couldn't dupe stdin, most likely because it's # couldn't dupe stdin, most likely because it's
# not a valid file descriptor, so we just rely on # not a valid file descriptor, so we just rely on
# using the one that was passed in # using the one that was passed in