aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTristan Sloughter <[email protected]>2013-02-04 18:08:13 -0600
committerTristan Sloughter <[email protected]>2013-02-04 18:09:17 -0600
commit2b20716439dd0f540dbf78cc6eaabf1aa32f8583 (patch)
treea70f55d58e9a837d247b81333ea28d995aca5157 /src
parent1207514752a0e522893c60eb6434cb4a8117a7f1 (diff)
downloadrelx-2b20716439dd0f540dbf78cc6eaabf1aa32f8583.tar.gz
relx-2b20716439dd0f540dbf78cc6eaabf1aa32f8583.tar.bz2
relx-2b20716439dd0f540dbf78cc6eaabf1aa32f8583.zip
fix: replace COnfigFile with empty string if undefined
Diffstat (limited to 'src')
-rw-r--r--src/rcl_state.erl2
-rw-r--r--src/rcl_util.erl9
2 files changed, 8 insertions, 3 deletions
diff --git a/src/rcl_state.erl b/src/rcl_state.erl
index ecf3115..25497f8 100644
--- a/src/rcl_state.erl
+++ b/src/rcl_state.erl
@@ -256,7 +256,7 @@ format(#state_t{log=LogState, output_dir=OutDir, lib_dirs=LibDirs,
[rcl_util:indent(Indent),
<<"state(">>, erlang:atom_to_list(Caller), <<"):\n">>,
rcl_util:indent(Indent + 1), <<"log: ">>, rcl_log:format(LogState), <<",\n">>,
- rcl_util:indent(Indent + 1), "config file: ", ConfigFile, "\n",
+ rcl_util:indent(Indent + 1), "config file: ", rcl_util:optional_to_string(ConfigFile), "\n",
rcl_util:indent(Indent + 1), "goals: \n",
[[rcl_util:indent(Indent + 2), rcl_depsolver:format_constraint(Goal), ",\n"] || Goal <- Goals],
rcl_util:indent(Indent + 1), "output_dir: ", OutDir, "\n",
diff --git a/src/rcl_util.erl b/src/rcl_util.erl
index 06d957d..a879c58 100644
--- a/src/rcl_util.erl
+++ b/src/rcl_util.erl
@@ -25,7 +25,8 @@
to_binary/1,
is_error/1,
error_reason/1,
- indent/1]).
+ indent/1,
+ optional_to_string/1]).
-define(ONE_LEVEL_INDENT, " ").
%%============================================================================
@@ -68,7 +69,11 @@ is_error({error, _}) ->
is_error(_) ->
false.
-
+%% @doc convert optional argument to empty string if undefined
+optional_to_string(undefined) ->
+ "";
+optional_to_string(Value) when is_list(Value) ->
+ Value.
%%%===================================================================
%%% Test Functions