Update from Upstream

1 files changed, 13 insertions, 4 deletions

diff --git a/src/rebar_log.erl b/src/rebar_log.erl
index b1a70c2..7fc2312 100644
--- a/src/rebar_log.erl
+++ b/src/rebar_log.erl
@@ -57,6 +57,8 @@ intensity() ->
                         high;
                     "low" ->
                         low;
+                    "none" ->
+                        none;
                     _ ->
                         ?DFLT_INTENSITY
                 end,
@@ -91,11 +93,18 @@ get_level() ->
     end.
 
 log(Level = error, Str, Args) ->
-    {ok, LogState} = application:get_env(rebar, log),
-    ec_cmd_log:Level(LogState, lists:flatten(cf:format("~!^~s~n", [Str])), Args);
+    case application:get_env(rebar, log) of
+        {ok, LogState} ->
+            NewStr = lists:flatten(cf:format("~!^~ts~n", [Str])),
+            ec_cmd_log:Level( LogState, NewStr, Args);
+        undefined -> % fallback
+            io:format(standard_error, Str++"~n", Args)
+    end;
 log(Level, Str, Args) ->
-    {ok, LogState} = application:get_env(rebar, log),
-    ec_cmd_log:Level(LogState, Str++"~n", Args).
+    case application:get_env(rebar, log) of
+        {ok, LogState} -> ec_cmd_log:Level(LogState, Str++"~n", Args);
+        undefined -> io:format(Str++"~n", Args)
+    end.
 
 crashdump(Str, Args) ->
     crashdump("rebar3.crashdump", Str, Args).