Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
3ddd20cf51
1 changed files with 1 additions and 1 deletions
|
@ -15,7 +15,7 @@ def maybe_exit(rc):
|
||||||
if maybe_exit_should_exit:
|
if maybe_exit_should_exit:
|
||||||
sys.exit(rc)
|
sys.exit(rc)
|
||||||
if maybe_exit_reraise:
|
if maybe_exit_reraise:
|
||||||
e = sys.exception()
|
e = sys.exc_info()[1]
|
||||||
if e:
|
if e:
|
||||||
raise e
|
raise e
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue