diff options
| author | Tristan Sloughter <tristan.sloughter@gmail.com> | 2015-01-07 16:28:49 -0600 |
|---|---|---|
| committer | Tristan Sloughter <tristan.sloughter@gmail.com> | 2015-01-07 16:28:49 -0600 |
| commit | 043ffdbc61b1f30abc77b463b8361fcdfa4878a2 (patch) | |
| tree | 69040d77c6afb690dafaf89c0533d1671b643361 /src | |
| parent | a6f43830bb29d3839f4f2a2c47ea8152eed606c5 (diff) | |
| parent | f1ed8ed36c9b8761829657c6b51cfb0cdaa68dad (diff) | |
Merge pull request #93 from tsloughter/master
do not include dir . in relx lib paths it will break lib discovery
Diffstat (limited to 'src')
| -rw-r--r-- | src/rebar_prv_release.erl | 3 | ||||
| -rw-r--r-- | src/rebar_prv_tar.erl | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/rebar_prv_release.erl b/src/rebar_prv_release.erl index d7495a5..29e1dc2 100644 --- a/src/rebar_prv_release.erl +++ b/src/rebar_prv_release.erl @@ -34,7 +34,8 @@ init(State) -> do(State) -> Options = rebar_state:command_args(State), DepsDir = rebar_dir:deps_dir(State), - LibDirs = lists:usort(rebar_utils:filtermap(fun ec_file:exists/1, [DepsDir | ?DEFAULT_PROJECT_APP_DIRS])), + LibDirs = rebar_utils:filtermap(fun ec_file:exists/1, + [DepsDir | lists:delete(".", ?DEFAULT_PROJECT_APP_DIRS)]), OutputDir = filename:join(rebar_dir:base_dir(State), ?DEFAULT_RELEASE_DIR), AllOptions = string:join(["release" | Options], " "), try diff --git a/src/rebar_prv_tar.erl b/src/rebar_prv_tar.erl index 2a69a28..7efa544 100644 --- a/src/rebar_prv_tar.erl +++ b/src/rebar_prv_tar.erl @@ -34,7 +34,8 @@ init(State) -> do(State) -> Options = rebar_state:command_args(State), DepsDir = rebar_dir:deps_dir(State), - LibDirs = lists:usort(rebar_utils:filtermap(fun ec_file:exists/1, [DepsDir | ?DEFAULT_PROJECT_APP_DIRS])), + LibDirs = rebar_utils:filtermap(fun ec_file:exists/1, + [DepsDir | lists:delete(".", ?DEFAULT_PROJECT_APP_DIRS)]), OutputDir = filename:join(rebar_dir:base_dir(State), ?DEFAULT_RELEASE_DIR), AllOptions = string:join(["release", "tar" | Options], " "), case rebar_state:get(State, relx, []) of |