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

exception ans sys.exit fixes

Browse source
This commit is contained in:
Brian Coca 2016-06-16 15:27:37 -04:00 committed by Matt Clay
parent 1b88df0bda
commit 51c3eda259
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/modules/utilities/logic/async_wrapper.py
View file

@ -48,8 +48,7 @@ def daemonize_self():
sys.exit(0) sys.exit(0)
except OSError: except OSError:
e = get_exception() e = get_exception()
sys.stderr.write("fork #1 failed: %d (%s)\n" % (e.errno, e.strerror)) sys.exit("fork #1 failed: %d (%s)\n" % (e.errno, e.strerror))
sys.exit(1)
# decouple from parent environment # decouple from parent environment
os.chdir("/") os.chdir("/")
@ -64,8 +63,7 @@ def daemonize_self():
sys.exit(0) sys.exit(0)
except OSError: except OSError:
e = get_exception() e = get_exception()
sys.stderr.write("fork #2 failed: %d (%s)\n" % (e.errno, e.strerror)) sys.exit("fork #2 failed: %d (%s)\n" % (e.errno, e.strerror))
sys.exit(1)
dev_null = file('/dev/null','rw') dev_null = file('/dev/null','rw')
os.dup2(dev_null.fileno(), sys.stdin.fileno()) os.dup2(dev_null.fileno(), sys.stdin.fileno())
@ -202,8 +200,6 @@ if __name__ == '__main__':
except SystemExit: except SystemExit:
# On python2.4, SystemExit is a subclass of Exception. # On python2.4, SystemExit is a subclass of Exception.
# This block makes python2.4 behave the same as python2.5+ # This block makes python2.4 behave the same as python2.5+
e = sys.exc_info()[1]
sys.exit(e.code)
except Exception: except Exception:
e = sys.exc_info()[1] e = sys.exc_info()[1]