summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorViacheslav V. Kovalev <kovyl2404@gmail.com>2015-05-20 23:38:29 +0300
committerViacheslav Kovalev <kovyl2404@gmail.com>2015-05-21 15:09:13 +0300
commitefd2445c7424d118a4cef3b3db6c5e323ede2484 (patch)
tree7234ecd2524b53b654900f984f1850bb4c912895 /src
parentbf1650e10db9249cab01bb8f6d726d0458555aa5 (diff)
Properly reset hooks for single-app project
Diffstat (limited to 'src')
-rw-r--r--src/rebar_app_discover.erl4
-rw-r--r--src/rebar_prv_compile.erl2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/rebar_app_discover.erl b/src/rebar_app_discover.erl
index 73401bc..4eda199 100644
--- a/src/rebar_app_discover.erl
+++ b/src/rebar_app_discover.erl
@@ -65,10 +65,10 @@ project_app_config(AppInfo, State) ->
%% Here we check if the app is at the root of the project.
%% If it is, then drop the hooks from the config so they aren't run twice
maybe_reset_hooks(C, Dir, State) ->
- case filename:dirname(rebar_dir:root_dir(State)) of
+ case ec_file:real_dir_path(rebar_dir:root_dir(State)) of
Dir ->
C1 = proplists:delete(provider_hooks, C),
- proplists:delete(hooks, C1);
+ proplists:delete(post_hooks, proplists:delete(pre_hooks, C1));
_ ->
C
end.
diff --git a/src/rebar_prv_compile.erl b/src/rebar_prv_compile.erl
index f70ca28..704a9f0 100644
--- a/src/rebar_prv_compile.erl
+++ b/src/rebar_prv_compile.erl
@@ -37,7 +37,7 @@ do(State) ->
ProjectApps = rebar_state:project_apps(State),
Providers = rebar_state:providers(State),
Deps = rebar_state:deps_to_build(State),
- Cwd = rebar_dir:get_cwd(),
+ Cwd = rebar_state:dir(State),
%% Need to allow global config vars used on deps
%% Right now no way to differeniate and just give deps a new state