From 9168632da88fe32af46e1ed8dd6e6b22b4094593 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sun, 16 Feb 2014 18:58:46 -0600
Subject: by default do not do app and release discovery under output dir

---
 src/rlx_dscv_util.erl     | 29 +++++++++++++++++------------
 src/rlx_prv_assembler.erl |  2 +-
 2 files changed, 18 insertions(+), 13 deletions(-)

(limited to 'src')

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
-- 
cgit v1.2.3