aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/rlx_dscv_util.erl29
-rw-r--r--src/rlx_prv_assembler.erl2
2 files changed, 18 insertions, 13 deletions
diff --git a/src/rlx_dscv_util.erl b/src/rlx_dscv_util.erl
index 6cfea81..a4a265c 100644
--- a/src/rlx_dscv_util.erl
+++ b/src/rlx_dscv_util.erl
@@ -115,19 +115,24 @@ discover_real_symlink_dir(ProcessDir, File) ->
ok = file:set_cwd(File),
{ok, ActualRealDir} = file:get_cwd(),
ok = file:set_cwd(CurCwd),
- lists:prefix(iolist_to_list(filename:absname(ActualRealDir)),
- iolist_to_list(filename:absname(File))),
- case ProcessDir(File, directory) of
- {ok, Result, true} ->
- [{ok, Result} | recurse(ProcessDir, File)];
- {noresult, true} ->
- recurse(ProcessDir, File);
- {ok, Result, _} ->
- [{ok, Result}];
- {noresult, _} ->
+ case lists:prefix(iolist_to_list(filename:absname(ActualRealDir)),
+ iolist_to_list(filename:absname(File))) of
+ true ->
+ %% Ignore cycles
[];
- Err = {error, _} ->
- [Err]
+ false ->
+ case ProcessDir(File, directory) of
+ {ok, Result, true} ->
+ [{ok, Result} | recurse(ProcessDir, File)];
+ {noresult, true} ->
+ recurse(ProcessDir, File);
+ {ok, Result, _} ->
+ [{ok, Result}];
+ {noresult, _} ->
+ [];
+ Err = {error, _} ->
+ [Err]
+ end
end.
recurse(ProcessDir, File) ->
diff --git a/src/rlx_prv_assembler.erl b/src/rlx_prv_assembler.erl
index a21dd3d..d3ab2f6 100644
--- a/src/rlx_prv_assembler.erl
+++ b/src/rlx_prv_assembler.erl
@@ -376,7 +376,7 @@ copy_or_generate_sys_config_file(State, RelDir) ->
%% @doc copy config/sys.config or generate one to releases/VSN/sys.config
-spec copy_or_symlink_config_file(rlx_state:t(), file:name(), file:name()) ->
- {ok, rlx_state:t()} | relx:error().
+ ok.
copy_or_symlink_config_file(State, ConfigPath, RelConfPath) ->
ensure_not_exist(RelConfPath),
case rlx_state:dev_mode(State) of