aboutsummaryrefslogtreecommitdiffstats
path: root/lib/reltool/src/reltool.erl
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2012-03-21 19:10:49 +0100
committerSiri Hansen <[email protected]>2012-03-21 19:11:15 +0100
commit33e42a694e0ddd8a6c02bfe6c04298ca95aa938a (patch)
tree5c416c25321d3b6372ca2be871aead7fb234e5cd /lib/reltool/src/reltool.erl
parent22d5fe18a285784fe724d5f1ce62578bd7ff4f1a (diff)
parente855e8326a6ce589991da9cafc2590f306d035c3 (diff)
downloadotp-33e42a694e0ddd8a6c02bfe6c04298ca95aa938a.tar.gz
otp-33e42a694e0ddd8a6c02bfe6c04298ca95aa938a.tar.bz2
otp-33e42a694e0ddd8a6c02bfe6c04298ca95aa938a.zip
Merge branch 'siri/reltool/fresh-up' into maint
OTP-9792 OTP-9794 OTP-9967 OTP-9968 OTP-9980 OTP-9984 * siri/reltool/fresh-up: (27 commits) [reltool] Improve title of dependency colum [reltool] Update status bar for all config changes and for generate target [reltool] Fix GUI problems on Windows [reltool] Remove skip statement for test that failed due to stdlib error [sasl] Sort applications used by other applications correctly in .script [sasl] Doc that included applications in .rel defaults to same as in .app [reltool] Fix problems with sorting of applications [reltool] Just warn if same module occurs twice in .app file [reltool] Always return warnings as flat strings [reltool] Fix type spec and doc for app() and mod() [reltool] Move tables out of common record [reltool] Display warnings continously in GUI [reltool] Cleanup test code [reltool] Unset ERL_FLAGS when running escript from reltool_server_SUITE [reltool] Improve error handling [reltool] Fix rollback and undo [reltool] Link together escript with inlined application [reltool] Fix badmatch when starting GUI [reltool] Update state and tables consistently for all types of config changes [reltool] Add test cases for handling of escripts ...
Diffstat (limited to 'lib/reltool/src/reltool.erl')
-rw-r--r--lib/reltool/src/reltool.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/reltool/src/reltool.erl b/lib/reltool/src/reltool.erl
index 54eb1ca9e1..2bdf222aa0 100644
--- a/lib/reltool/src/reltool.erl
+++ b/lib/reltool/src/reltool.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -59,7 +59,7 @@ start_link(Options) when is_list(Options) ->
{ok, _WinPid} = OK ->
OK;
{error, Reason} ->
- {error, lists:flatten(io_lib:format("~p", [Reason]))}
+ {error, Reason}
end.
%% Start server process with options
@@ -69,7 +69,7 @@ start_server(Options) ->
{ok, ServerPid, _Common, _Sys} ->
{ok, ServerPid};
{error, Reason} ->
- {error, lists:flatten(io_lib:format("~p", [Reason]))}
+ {error, Reason}
end.
%% Start server process with options