diff options
| author | simonxu72 <simon.xu72@gmail.com> | 2018-10-16 18:37:28 +0800 |
|---|---|---|
| committer | simonxu72 <simon.xu72@gmail.com> | 2018-10-16 18:37:28 +0800 |
| commit | 41d133856bf199034b0eeb0903bedc2071fba7e1 (patch) | |
| tree | 15135eaf1501e016ec1b91b275356a0cfd92d867 /src/rebar_prv_plugins.erl | |
| parent | b81871c61809a9e5c09f54d6c8298908d18a760c (diff) | |
| parent | 7bfc8110d1736d2cbf61e19d2fc16dc8e854b460 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/rebar_prv_plugins.erl')
| -rw-r--r-- | src/rebar_prv_plugins.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rebar_prv_plugins.erl b/src/rebar_prv_plugins.erl index 4bea3b3..d66b645 100644 --- a/src/rebar_prv_plugins.erl +++ b/src/rebar_prv_plugins.erl @@ -36,7 +36,7 @@ do(State) -> GlobalPlugins = rebar_state:get(GlobalConfig, plugins, []), GlobalSrcDirs = rebar_state:get(GlobalConfig, src_dirs, ["src"]), GlobalPluginsDir = filename:join([rebar_dir:global_cache_dir(rebar_state:opts(State)), "plugins", "*"]), - GlobalApps = rebar_app_discover:find_apps([GlobalPluginsDir], GlobalSrcDirs, all), + GlobalApps = rebar_app_discover:find_apps([GlobalPluginsDir], GlobalSrcDirs, all, State), display_plugins("Global plugins", GlobalApps, GlobalPlugins), RebarOpts = rebar_state:opts(State), @@ -44,7 +44,7 @@ do(State) -> Plugins = rebar_state:get(State, plugins, []), PluginsDirs = filelib:wildcard(filename:join(rebar_dir:plugins_dir(State), "*")), CheckoutsDirs = filelib:wildcard(filename:join(rebar_dir:checkouts_dir(State), "*")), - Apps = rebar_app_discover:find_apps(CheckoutsDirs++PluginsDirs, SrcDirs, all), + Apps = rebar_app_discover:find_apps(CheckoutsDirs++PluginsDirs, SrcDirs, all, State), display_plugins("Local plugins", Apps, Plugins), {ok, State}. |