Merge branch 'danikp-feature_long_src_paths' of github.com:ferd/rebar…

…3 into danikp-feature_long_src_paths
erlang · Apr 27, 2018 · 19d20c5 · 19d20c5
2 parents 81bd21b + 775261d
commit 19d20c5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/rebar_prv_compile.erl b/src/rebar_prv_compile.erl
@@ -236,7 +236,10 @@ copy_app_dirs(AppInfo, OldAppDir, AppDir) ->
 symlink_or_copy(OldAppDir, AppDir, Dir) ->
     Source = filename:join([OldAppDir, Dir]),
     Target = filename:join([AppDir, Dir]),
-    rebar_file_utils:symlink_or_copy(Source, Target).
+    case ec_file:is_dir(Source) of
+        true -> rebar_file_utils:symlink_or_copy(Source, Target);
+        false -> ok
+    end.
 
 copy(OldAppDir, AppDir, Dir) ->
     Source = filename:join([OldAppDir, Dir]),

diff --git a/test/rebar_dir_SUITE.erl b/test/rebar_dir_SUITE.erl
@@ -79,13 +79,10 @@ alt_src_dir_nested(Config) ->
     RebarConfig = [{src_dirs, ["src", "alt/nested"]}],
     AppsDir = ?config(apps, Config),
     Name1 = ?config(app_one, Config),
-    Name2 = ?config(app_two, Config),
     ModDir = filename:join([AppsDir, "apps", Name1, "alt", "nested"]),
-    ModDir2 = filename:join([AppsDir, "apps", Name2, "alt", "nested"]),
     Mod = "-module(altmod). -export([main/0]). main() -> ok.",
 
     ec_file:mkdir_path(ModDir),
-    ec_file:mkdir_path(ModDir2),
     ok = file:write_file(filename:join([ModDir, "altmod.erl"]), Mod),
 
     Ebin = filename:join([AppsDir, "_build", "default", "lib", Name1, "ebin", "altmod.beam"]),