aboutsummaryrefslogtreecommitdiffstats
path: root/lib/syntax_tools/src
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2017-06-26 09:08:46 +0200
committerHans Bolinder <[email protected]>2017-06-26 09:08:46 +0200
commit900ef806aed51dd9b976e14cde63e3282a39b685 (patch)
treeefaa7ae9cbdd3ef4341dff857457da0d5db54d54 /lib/syntax_tools/src
parent742b316a05f7b750bec8be6b8540d3ef3ddc6deb (diff)
parentbd2752e3d2ec91572e4d0c2fb35951f8f6bdc9f6 (diff)
downloadotp-900ef806aed51dd9b976e14cde63e3282a39b685.tar.gz
otp-900ef806aed51dd9b976e14cde63e3282a39b685.tar.bz2
otp-900ef806aed51dd9b976e14cde63e3282a39b685.zip
Merge branch 'maint'
* maint: syntax_tools: erl_tidy: Do not hang when exits are trapped
Diffstat (limited to 'lib/syntax_tools/src')
-rw-r--r--lib/syntax_tools/src/erl_tidy.erl2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/syntax_tools/src/erl_tidy.erl b/lib/syntax_tools/src/erl_tidy.erl
index 1ca60ea73b..888cb71f51 100644
--- a/lib/syntax_tools/src/erl_tidy.erl
+++ b/lib/syntax_tools/src/erl_tidy.erl
@@ -301,6 +301,8 @@ file(Name, Opts) ->
{Child, ok} ->
ok;
{Child, {error, Reason}} ->
+ exit(Reason);
+ {'EXIT', Child, Reason} ->
exit(Reason)
end.