浏览代码

error on dep name that isn't an atom

pull/330/head
Tristan Sloughter 10 年前
父节点
当前提交
ef22eeb387
共有 1 个文件被更改,包括 11 次插入4 次删除
  1. +11
    -4
      src/rebar_config.erl

+ 11
- 4
src/rebar_config.erl 查看文件

@ -28,10 +28,12 @@
-export([consult/1 -export([consult/1
,consult_file/1 ,consult_file/1
,format_error/1
,merge_locks/2]). ,merge_locks/2]).
-include("rebar.hrl"). -include("rebar.hrl").
-include_lib("providers/include/providers.hrl").
%% =================================================================== %% ===================================================================
%% Public API %% Public API
@ -77,6 +79,9 @@ merge_locks(Config, [Locks]) ->
NewDeps = find_newly_added(ConfigDeps, Locks), NewDeps = find_newly_added(ConfigDeps, Locks),
[{{locks, default}, Locks}, {{deps, default}, NewDeps++Deps} | Config]. [{{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 %% Internal functions
%% =================================================================== %% ===================================================================
@ -107,12 +112,12 @@ bs(Vars) ->
%% Find deps that have been added to the config after the lock was created %% Find deps that have been added to the config after the lock was created
find_newly_added(ConfigDeps, LockedDeps) -> find_newly_added(ConfigDeps, LockedDeps) ->
rebar_utils:filtermap(fun(Dep) when is_tuple(Dep) -> rebar_utils:filtermap(fun(Dep) when is_tuple(Dep) ->
check_dep(element(1, Dep), LockedDeps);
check_newly_added(element(1, Dep), LockedDeps);
(Dep) -> (Dep) ->
check_dep(Dep, LockedDeps)
check_newly_added(Dep, LockedDeps)
end, ConfigDeps). end, ConfigDeps).
check_dep(Dep, LockedDeps) ->
check_newly_added(Dep, LockedDeps) when is_atom(Dep) ->
NewDep = ec_cnv:to_binary(Dep), NewDep = ec_cnv:to_binary(Dep),
case lists:keyfind(NewDep, 1, LockedDeps) of case lists:keyfind(NewDep, 1, LockedDeps) of
false -> false ->
@ -127,4 +132,6 @@ check_dep(Dep, LockedDeps) ->
[NewDep, NewDep]), [NewDep, NewDep]),
false false
end end
end.
end;
check_newly_added(Dep, _) ->
throw(?PRV_ERROR({bad_dep_name, Dep})).

正在加载...
取消
保存