aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJordan Wilberding <[email protected]>2015-07-18 11:18:51 -0700
committerJordan Wilberding <[email protected]>2015-07-18 11:18:51 -0700
commitfd9d25650730a764517b591bcf6301a4ddedf8fe (patch)
tree7264018a7668dc399536995c169629bf0ebd22e6
parentaf0237fd2ca71f7724cdb663498e6a84827930a9 (diff)
parent15eac7dab9cfa20a3d1f23942a4a381075925260 (diff)
downloadrelx-fd9d25650730a764517b591bcf6301a4ddedf8fe.tar.gz
relx-fd9d25650730a764517b591bcf6301a4ddedf8fe.tar.bz2
relx-fd9d25650730a764517b591bcf6301a4ddedf8fe.zip
Merge pull request #369 from tsloughter/master
run overlay after release not before
-rw-r--r--rebar.lock2
-rw-r--r--src/rlx_prv_assembler.erl5
2 files changed, 4 insertions, 3 deletions
diff --git a/rebar.lock b/rebar.lock
index 287e3b0..74bbb41 100644
--- a/rebar.lock
+++ b/rebar.lock
@@ -1,4 +1,4 @@
[{<<"bbmustache">>,{pkg,<<"bbmustache">>,<<"1.0.3">>},0},
{<<"providers">>,{pkg,<<"providers">>,<<"1.4.1">>},0},
- {<<"erlware_commons">>,{pkg,<<"erlware_commons">>,<<"0.14.0">>},0},
+ {<<"erlware_commons">>,{pkg,<<"erlware_commons">>,<<"0.15.0">>},0},
{<<"getopt">>,{pkg,<<"getopt">>,<<"0.8.2">>},0}].
diff --git a/src/rlx_prv_assembler.erl b/src/rlx_prv_assembler.erl
index f98f854..9a267e4 100644
--- a/src/rlx_prv_assembler.erl
+++ b/src/rlx_prv_assembler.erl
@@ -31,7 +31,7 @@
-include("relx.hrl").
-define(PROVIDER, release).
--define(DEPS, [overlay]).
+-define(DEPS, [resolve_release]).
%%============================================================================
%% API
@@ -40,7 +40,8 @@
init(State) ->
State1 = rlx_state:add_provider(State, providers:create([{name, ?PROVIDER},
{module, ?MODULE},
- {deps, ?DEPS}])),
+ {deps, ?DEPS},
+ {hooks, {[], [overlay]}}])),
{ok, State1}.
%% @doc recursively dig down into the library directories specified in the state