瀏覽代碼

fix for mix projects that don't have app.src files (#1964)

pull/1965/head
Tristan Sloughter 6 年之前
committed by GitHub
父節點
當前提交
73bf5b4c05
沒有發現已知的金鑰在資料庫的簽署中 GPG Key ID: 4AEE18F83AFDEB23
共有 2 個文件被更改,包括 6 次插入2 次删除
  1. +4
    -1
      src/rebar_app_info.erl
  2. +2
    -1
      src/rebar_app_utils.erl

+ 4
- 1
src/rebar_app_info.erl 查看文件

@ -343,9 +343,12 @@ app_file(AppInfo=#app_info_t{}, AppFile) ->
app_details(AppInfo=#app_info_t{app_details=[]}) ->
case app_file(AppInfo) of
undefined ->
case rebar_config:consult_app_file(app_file_src(AppInfo)) of
try rebar_config:consult_app_file(app_file_src(AppInfo)) of
[] -> [];
[{application, _Name, AppDetails}] -> AppDetails
catch
_:_ ->
[]
end;
AppFile ->
try rebar_file_utils:try_consult(AppFile) of

+ 2
- 1
src/rebar_app_utils.erl 查看文件

@ -224,7 +224,8 @@ dep_to_app(Parent, DepsDir, Name, Vsn, Source, IsLock, State) ->
{ok, AppInfo0} =
case rebar_app_info:discover(Dir) of
{ok, App} ->
{ok, rebar_app_info:is_available(rebar_app_info:parent(App, Parent),
App1 = rebar_app_info:name(App, Name),
{ok, rebar_app_info:is_available(rebar_app_info:parent(App1, Parent),
true)};
not_found ->
rebar_app_info:new(Parent, Name, Vsn, Dir, [])

Loading…
取消
儲存