44 lines
1.5 KiB
Diff
44 lines
1.5 KiB
Diff
From 61ee2778f3931fdc95437208bdbb04b5477dabd9 Mon Sep 17 00:00:00 2001
|
|
From: Peter Lemenkov <lemenkov@gmail.com>
|
|
Date: Tue, 22 May 2012 14:03:31 +0400
|
|
Subject: [PATCH 5/9] No erlang:min/2 and erlang:max/2 in R12B
|
|
|
|
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
|
---
|
|
src/rebar_config.erl | 2 +-
|
|
src/rebar_log.erl | 5 ++++-
|
|
2 files changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/rebar_config.erl b/src/rebar_config.erl
|
|
index 7f7d03c..41fa7be 100644
|
|
--- a/src/rebar_config.erl
|
|
+++ b/src/rebar_config.erl
|
|
@@ -110,7 +110,7 @@ set(Config, Key, Value) ->
|
|
set_global(jobs=Key, Value) when is_list(Value) ->
|
|
set_global(Key, list_to_integer(Value));
|
|
set_global(jobs=Key, Value) when is_integer(Value) ->
|
|
- application:set_env(rebar_global, Key, erlang:max(1, Value));
|
|
+ application:set_env(rebar_global, Key, case (1 > Value) of true -> 1; _ -> Value end);
|
|
set_global(Key, Value) ->
|
|
application:set_env(rebar_global, Key, Value).
|
|
|
|
diff --git a/src/rebar_log.erl b/src/rebar_log.erl
|
|
index b7529a9..29cd4ee 100644
|
|
--- a/src/rebar_log.erl
|
|
+++ b/src/rebar_log.erl
|
|
@@ -69,7 +69,10 @@ default_level() -> error_level().
|
|
%% ===================================================================
|
|
|
|
valid_level(Level) ->
|
|
- erlang:max(error_level(), erlang:min(Level, debug_level())).
|
|
+ DL0= debug_level(),
|
|
+ EL = error_level(),
|
|
+ DL = case (Level < DL0) of true -> Level; _ -> DL0 end,
|
|
+ case (EL > DL) of true -> EL; _ -> DL end.
|
|
|
|
error_level() -> 0.
|
|
debug_level() -> 3.
|
|
--
|
|
1.8.0.1
|
|
|