summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKresten Krab Thorup <krab@trifork.com>2011-05-19 11:23:12 +0200
committerDave Smith <dizzyd@dizzyd.com>2012-07-11 08:42:48 -0600
commitb890421caea5c62a4d06e5d3a24877a2bfbeb901 (patch)
tree7fcb8ba3c5c3e8926dc1edde7f03316cbd8498ee /src
parentc71bbf6a0d97b87411c1553f1f1285e3a98a33ee (diff)
Allow crypto to already be loaded when starting rebar
Diffstat (limited to 'src')
-rw-r--r--src/rebar.erl5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/rebar.erl b/src/rebar.erl
index 11b97da..0b7602b 100644
--- a/src/rebar.erl
+++ b/src/rebar.erl
@@ -95,7 +95,10 @@ run_aux(["version"]) ->
ok;
run_aux(Commands) ->
%% Make sure crypto is running
- ok = crypto:start(),
+ case crypto:start() of
+ ok -> ok;
+ {error,{already_started,crypto}} -> ok
+ end,
%% Initialize logging system
rebar_log:init(),