diff options
author | Fred Hebert <mononcqc@ferd.ca> | 2018-10-06 11:38:33 -0400 |
---|---|---|
committer | Fred Hebert <mononcqc@ferd.ca> | 2018-10-11 08:43:54 -0400 |
commit | 311ee6b1371c3eea3611dc5d7945b1b5667c75bd (patch) | |
tree | 8f80ef6c684bc610848a998813dae788d7df1802 /src/rebar_paths.erl | |
parent | 9d788d893620f868b9c0ee00ddec8ae4d5d8fea7 (diff) |
Fix a bug in compiler path handling
Also handle some formatting
Diffstat (limited to 'src/rebar_paths.erl')
-rw-r--r-- | src/rebar_paths.erl | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/rebar_paths.erl b/src/rebar_paths.erl index bb43897..71f0016 100644 --- a/src/rebar_paths.erl +++ b/src/rebar_paths.erl @@ -130,11 +130,10 @@ misloaded_modules(Mods, GoodAppPaths, ModPaths) -> %% Identify paths that are invalid; i.e. app paths that cover an %% app in the desired group, but are not in the desired group. lists:usort( - [purge_mod(Mod) - || Mod <- Mods, - {_, Path} <- [lists:keyfind(Mod, 1, ModPaths)], - is_list(Path), % not 'preloaded' or mocked - not any_prefix(Path, GoodAppPaths)] + [Mod || Mod <- Mods, + {_, Path} <- [lists:keyfind(Mod, 1, ModPaths)], + is_list(Path), % not 'preloaded' or mocked + not any_prefix(Path, GoodAppPaths)] ). any_prefix(Path, Paths) -> @@ -168,10 +167,10 @@ get_apps(deps, State) -> %% The code paths for deps also include the top level apps %% and the extras, which we don't have here; we have to %% add the apps by hand - rebar_state:all_deps(State) ++ case rebar_state:project_apps(State) of undefined -> []; List -> List - end; + end ++ + rebar_state:all_deps(State); get_apps(plugins, State) -> rebar_state:all_plugin_deps(State). |