瀏覽代碼

bug修改 避免win下递归查询的时候死循环

master
SisMaker 4 年之前
父節點
當前提交
0f987dde97
共有 1 個檔案被更改,包括 9 行新增3 行删除
  1. +9
    -3
      src/sync/esUtils.erl

+ 9
- 3
src/sync/esUtils.erl 查看文件

@ -196,12 +196,18 @@ findIncludeDirFromAncestors(_, _, "/") -> undefined;
findIncludeDirFromAncestors(_, _, ".") -> undefined; findIncludeDirFromAncestors(_, _, ".") -> undefined;
findIncludeDirFromAncestors(_, _, "") -> undefined; findIncludeDirFromAncestors(_, _, "") -> undefined;
findIncludeDirFromAncestors(Cwd, IncludeBase, Dir) -> findIncludeDirFromAncestors(Cwd, IncludeBase, Dir) ->
AttemptDir = filename:join(filename:dirname(Dir), IncludeBase),
NewDirName = filename:dirname(Dir),
AttemptDir = filename:join(NewDirName, IncludeBase),
case filelib:is_dir(AttemptDir) of case filelib:is_dir(AttemptDir) of
true -> true ->
{ok, AttemptDir}; {ok, AttemptDir};
false -> false ->
findIncludeDirFromAncestors(Cwd, IncludeBase, filename:dirname(Dir))
case NewDirName =/= Dir of
true ->
findIncludeDirFromAncestors(Cwd, IncludeBase, NewDirName);
_ ->
undefined
end
end. end.
% normalizeCaseWindowsDir(Dir) -> % normalizeCaseWindowsDir(Dir) ->
@ -300,7 +306,7 @@ getSystemModules() ->
eunit, gs, hipe, inets, inets, inviso, jinterface, kernel, eunit, gs, hipe, inets, inets, inviso, jinterface, kernel,
mnesia, observer, orber, os_mon, parsetools, percept, pman, mnesia, observer, orber, os_mon, parsetools, percept, pman,
reltool, runtime_tools, sasl, snmp, ssl, stdlib, syntax_tools, reltool, runtime_tools, sasl, snmp, ssl, stdlib, syntax_tools,
test_server, toolbar, tools, tv, webtool, wx, xmerl, zlib
test_server, toolbar, tools, tv, webtool, wx, xmerl, zlib, rebar, rebar3
], ],
FAppMod = FAppMod =
fun(App) -> fun(App) ->

Loading…
取消
儲存