diff options
author | Siri Hansen <siri@erlang.org> | 2017-06-16 11:54:41 +0200 |
---|---|---|
committer | Siri Hansen <siri@erlang.org> | 2017-06-16 11:54:41 +0200 |
commit | cdc5545536ddeedf9ae4db20464afa6565f4327d (patch) | |
tree | 85fac17bf876b0f26bbb0c123ba9ed9c7b788059 /lib/sasl/src/release_handler.erl | |
parent | d3a53ae2b2800b33f3b25b83ff2314e64153c2aa (diff) | |
parent | aa4c93a7e04ce57584f7591b2b0cc62f4407ca00 (diff) | |
download | otp-cdc5545536ddeedf9ae4db20464afa6565f4327d.tar.gz otp-cdc5545536ddeedf9ae4db20464afa6565f4327d.tar.bz2 otp-cdc5545536ddeedf9ae4db20464afa6565f4327d.zip |
Merge branch 'siri/unicode-atoms/OTP-14285'
* siri/unicode-atoms/OTP-14285:
[sasl] Improve handling of unicode in rb
[ttb] Handle unicode atoms in trace data and config files
[dbg] Update default trace handler to print unicode atoms correctly
[etop] Fix handling of unicode atoms
[stdlib] Open sys debug logs as utf8
[stdlib] Open error log file as utf8
[sasl] Improve handling of unicode atoms
[ct] Print unicode atoms and strings correctly in common_test logs
Diffstat (limited to 'lib/sasl/src/release_handler.erl')
-rw-r--r-- | lib/sasl/src/release_handler.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/sasl/src/release_handler.erl b/lib/sasl/src/release_handler.erl index 669ffd95c0..1f3c6877d5 100644 --- a/lib/sasl/src/release_handler.erl +++ b/lib/sasl/src/release_handler.erl @@ -640,8 +640,8 @@ handle_call({install_release, Vsn, ErrorAction, Opts}, From, S) -> {noreply, NS}; {'EXIT', Reason} -> io:format("release_handler:" - "install_release(Vsn=~p Opts=~p) failed, " - "Reason=~p~n", [Vsn, Opts, Reason]), + "install_release(Vsn=~tp Opts=~tp) failed, " + "Reason=~tp~n", [Vsn, Opts, Reason]), gen_server:reply(From, {error, Reason}), case ErrorAction of restart -> @@ -1124,7 +1124,7 @@ new_emulator_make_hybrid_config(CurrentVsn,ToVsn,TmpVsn,RelDir,Masters) -> {ok,[FC]} -> FC; {error,Error1} -> - io:format("Warning: ~w can not read ~p: ~p~n", + io:format("Warning: ~w can not read ~tp: ~tp~n", [?MODULE,FromFile,Error1]), [] end, @@ -1134,7 +1134,7 @@ new_emulator_make_hybrid_config(CurrentVsn,ToVsn,TmpVsn,RelDir,Masters) -> {ok,[ToConfig]} -> [lists:keyfind(App,1,ToConfig) || App <- [kernel,stdlib,sasl]]; {error,Error2} -> - io:format("Warning: ~w can not read ~p: ~p~n", + io:format("Warning: ~w can not read ~tp: ~tp~n", [?MODULE,ToFile,Error2]), [false,false,false] end, @@ -1807,7 +1807,7 @@ check_opt_file(FileName, Type, Masters) -> ok -> true; _Error -> - io:format("Warning: ~p missing (optional)~n", [FileName]), + io:format("Warning: ~tp missing (optional)~n", [FileName]), false end. |