From 2b20716439dd0f540dbf78cc6eaabf1aa32f8583 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <tristan@heroku.com>
Date: Mon, 4 Feb 2013 18:08:13 -0600
Subject: fix: replace COnfigFile with empty string if undefined

---
 src/rcl_state.erl | 2 +-
 src/rcl_util.erl  | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'src')

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
-- 
cgit v1.2.3