summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/rebar_config.erl2
-rw-r--r--src/rebar_core.erl1
2 files changed, 3 insertions, 0 deletions
diff --git a/src/rebar_config.erl b/src/rebar_config.erl
index 7efdf75..5008533 100644
--- a/src/rebar_config.erl
+++ b/src/rebar_config.erl
@@ -41,6 +41,7 @@
-record(config, { dir :: file:filename(),
opts = [] :: list(),
+ %% TODO: consider storing envs in xconf
envs = new_env() :: dict(),
%% cross-directory config
skip_dirs = new_skip_dirs() :: dict(),
@@ -170,6 +171,7 @@ erase_xconf(Config, Key) ->
reset_xconf(Config) ->
Config#config{xconf = new_xconf()}.
+%% TODO: reconsider after config inheritance removal/redesign
clean_config(Old, New) ->
New#config{opts=Old#config.opts}.
diff --git a/src/rebar_core.erl b/src/rebar_core.erl
index 6d27e6b..493d256 100644
--- a/src/rebar_core.erl
+++ b/src/rebar_core.erl
@@ -68,6 +68,7 @@ process_commands([Command | Rest], ParentConfig) ->
_ ->
ok
end,
+ %% TODO: reconsider after config inheritance removal/redesign
ParentConfig3 = rebar_config:clean_config(ParentConfig1, ParentConfig2),
%% Wipe out vsn cache to avoid invalid hits when
%% dependencies are updated