diff options
| author | Tristan Sloughter <t@crashfast.com> | 2015-06-21 13:16:39 -0500 |
|---|---|---|
| committer | Tristan Sloughter <t@crashfast.com> | 2015-06-21 16:34:51 -0500 |
| commit | a5b3f6403b022457fb995285fd59350f1714af8d (patch) | |
| tree | a5bfafc550ef6d42383b81f919f48523a63def82 /src | |
| parent | 5866742dd88b89aa0d9bf9618b22e28268500703 (diff) | |
overrides working for pkg deps
Diffstat (limited to 'src')
| -rw-r--r-- | src/rebar_prv_install_deps.erl | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl index 806293b..84bf266 100644 --- a/src/rebar_prv_install_deps.erl +++ b/src/rebar_prv_install_deps.erl @@ -230,10 +230,8 @@ handle_pkg_dep(Profile, Pkg, Packages, Upgrade, DepsDir, Fetched, Seen, Locks, S Profiles = rebar_state:current_profiles(State), Name = rebar_app_info:name(AppInfo1), - C = rebar_config:consult(rebar_app_info:dir(AppInfo1)), - BaseDir = rebar_state:get(State, base_dir, []), - S1 = rebar_state:new(rebar_state:set(rebar_state:new(), base_dir, BaseDir), - C, rebar_app_info:dir(AppInfo1)), + + S1 = rebar_app_info:state(AppInfo1), S2 = rebar_state:apply_overrides(S1, Name), Plugins = rebar_state:get(S2, plugins, []), @@ -289,7 +287,16 @@ package_to_app(DepsDir, Packages, {Name, Vsn, Level}, IsLock, State) -> AppInfo2 = rebar_app_info:dir(AppInfo1, filename:join([DepsDir, Name])), AppInfo3 = rebar_app_info:dep_level(AppInfo2, Level), AppInfo4 = rebar_app_info:is_lock(AppInfo3, IsLock), - rebar_app_info:source(AppInfo4, {pkg, Name, Vsn}) + + C = rebar_config:consult(rebar_app_info:dir(AppInfo1)), + BaseDir = rebar_state:get(State, base_dir, []), + Overrides = rebar_state:get(State, overrides, []), + S = rebar_state:new(rebar_state:set(rebar_state:new(), base_dir, BaseDir), + C, rebar_app_info:dir(AppInfo1)), + ParentOverrides = rebar_state:overrides(State), + AppInfo5 = rebar_app_info:state(AppInfo4, + rebar_state:overrides(S, ParentOverrides++Overrides)), + rebar_app_info:source(AppInfo5, {pkg, Name, Vsn}) end. -spec update_src_deps(atom(), non_neg_integer(), list(), list(), list(), rebar_state:t(), boolean(), sets:set(binary()), list()) -> {rebar_state:t(), list(), list(), sets:set(binary())}. |