diff options
| author | Andrew Thompson <andrew@hijacked.us> | 2013-09-30 16:57:50 -0400 |
|---|---|---|
| committer | Andrew Thompson <andrew@hijacked.us> | 2013-09-30 16:57:50 -0400 |
| commit | e74de95eebecae56b9278e9fda3941410678fedd (patch) | |
| tree | 293c391ba739d045e2db4277fe023bf46241efb6 /src | |
| parent | eae26a5c4303f913b7d8d7177683cb4ae008d47c (diff) | |
Address review comments and add inttest for update-deps
Diffstat (limited to 'src')
| -rw-r--r-- | src/rebar_core.erl | 4 | ||||
| -rw-r--r-- | src/rebar_deps.erl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/rebar_core.erl b/src/rebar_core.erl index 42e106e..4d50f4f 100644 --- a/src/rebar_core.erl +++ b/src/rebar_core.erl @@ -168,7 +168,7 @@ skip_or_process_dir1(AppFile, ModuleSet, Config, CurrentCodePath, %% way to signal this to rebar_core, so we have to explicitly do it %% here... Otherwise if you use app=, it'll skip the toplevel %% directory and nothing will be updated. - process_dir1(Dir, Command, DirSet, Config1, + process_dir1(Dir, Command, DirSet, Config1, CurrentCodePath, ModuleSet); {Config1, {true, SkippedApp}} -> ?DEBUG("Skipping app: ~p~n", [SkippedApp]), @@ -181,7 +181,7 @@ skip_or_process_dir1(AppFile, ModuleSet, Config, CurrentCodePath, process_dir1(Dir, Command, DirSet, Config, CurrentCodePath, {DirModules, ModuleSetFile}) -> - Config0 = rebar_config:set(Config, command, Command), + Config0 = rebar_config:set(Config, current_command, Command), %% Get the list of modules for "any dir". This is a catch-all list %% of modules that are processed in addition to modules associated %% with this directory type. These any_dir modules are processed diff --git a/src/rebar_deps.erl b/src/rebar_deps.erl index 6450715..5e4f482 100644 --- a/src/rebar_deps.erl +++ b/src/rebar_deps.erl @@ -72,7 +72,7 @@ preprocess(Config, _) -> %% deps-related can be executed on their directories. NonRawAvailableDeps = [D || D <- AvailableDeps, not D#dep.is_raw], - case rebar_config:get(Config, command, undefined) of + case rebar_config:get(Config, current_command, undefined) of 'update-deps' -> %% Skip ALL of the dep folders, we do this because we don't want %% any other calls to preprocess() for update-deps beyond the |