diff options
| author | Tristan Sloughter <t@crashfast.com> | 2015-04-11 17:10:11 -0500 |
|---|---|---|
| committer | Tristan Sloughter <t@crashfast.com> | 2015-04-11 17:10:11 -0500 |
| commit | ef22eeb387d08548e971a5698d01924ef12b6095 (patch) | |
| tree | f26e9c68675a948b5346f7af2cb7347331d8f347 /src | |
| parent | 4ee7fef913977add95460544a25e4f8ceb803fb0 (diff) | |
error on dep name that isn't an atom
Diffstat (limited to 'src')
| -rw-r--r-- | src/rebar_config.erl | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/rebar_config.erl b/src/rebar_config.erl index 97aea91..5048ba3 100644 --- a/src/rebar_config.erl +++ b/src/rebar_config.erl @@ -28,10 +28,12 @@ -export([consult/1 ,consult_file/1 + ,format_error/1 ,merge_locks/2]). -include("rebar.hrl"). +-include_lib("providers/include/providers.hrl"). %% =================================================================== %% Public API @@ -77,6 +79,9 @@ merge_locks(Config, [Locks]) -> NewDeps = find_newly_added(ConfigDeps, Locks), [{{locks, default}, Locks}, {{deps, default}, NewDeps++Deps} | Config]. +format_error({bad_dep_name, Dep}) -> + io_lib:format("Dependency name must be an atom, instead found: ~p", [Dep]). + %% =================================================================== %% Internal functions %% =================================================================== @@ -107,12 +112,12 @@ bs(Vars) -> %% Find deps that have been added to the config after the lock was created find_newly_added(ConfigDeps, LockedDeps) -> rebar_utils:filtermap(fun(Dep) when is_tuple(Dep) -> - check_dep(element(1, Dep), LockedDeps); + check_newly_added(element(1, Dep), LockedDeps); (Dep) -> - check_dep(Dep, LockedDeps) + check_newly_added(Dep, LockedDeps) end, ConfigDeps). -check_dep(Dep, LockedDeps) -> +check_newly_added(Dep, LockedDeps) when is_atom(Dep) -> NewDep = ec_cnv:to_binary(Dep), case lists:keyfind(NewDep, 1, LockedDeps) of false -> @@ -127,4 +132,6 @@ check_dep(Dep, LockedDeps) -> [NewDep, NewDep]), false end - end. + end; +check_newly_added(Dep, _) -> + throw(?PRV_ERROR({bad_dep_name, Dep})). |