diff options
| author | Jordan Wilberding <[email protected]> | 2016-02-05 07:31:24 -0800 |
|---|---|---|
| committer | Jordan Wilberding <[email protected]> | 2016-02-05 07:31:24 -0800 |
| commit | 881f693dde13bde2bc2e5fbd74c1a6468a338fce (patch) | |
| tree | a073e3b6665628879af06754c82af97c245d17a5 | |
| parent | 527b8e13a4d7b4c4ee6519eb413ff816a049ab59 (diff) | |
| parent | 025d10eeb7ab3bea576b6561e523e95e0bc9bb24 (diff) | |
| download | relx-881f693dde13bde2bc2e5fbd74c1a6468a338fce.tar.gz relx-881f693dde13bde2bc2e5fbd74c1a6468a338fce.tar.bz2 relx-881f693dde13bde2bc2e5fbd74c1a6468a338fce.zip | |
Merge pull request #444 from tsloughter/issue_335
targetdir may be list not binary, convert before comparing
| -rw-r--r-- | src/rlx_prv_assembler.erl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/rlx_prv_assembler.erl b/src/rlx_prv_assembler.erl index 8f86dde..8e0050c 100644 --- a/src/rlx_prv_assembler.erl +++ b/src/rlx_prv_assembler.erl @@ -184,12 +184,12 @@ copy_app(LibDir, App, IncludeSrc, IncludeErts) -> AppVsn = rlx_app_info:original_vsn(App), AppDir = rlx_app_info:dir(App), TargetDir = filename:join([LibDir, AppName ++ "-" ++ AppVsn]), - if - AppDir == TargetDir -> + case AppDir == ec_cnv:to_binary(TargetDir) of + true -> %% No need to do anything here, discover found something already in %% a release dir ok; - true -> + false -> case IncludeErts of false -> case is_erts_lib(AppDir) of @@ -223,7 +223,6 @@ rewrite_app_file(App, TargetDir) -> ActiveDeps = rlx_app_info:active_deps(App), IncludedDeps = rlx_app_info:library_deps(App), AppFile = filename:join([TargetDir, "ebin", ec_cnv:to_list(Name) ++ ".app"]), - {ok, [{application, AppName, AppData}]} = file:consult(AppFile), OldActiveDeps = proplists:get_value(applications, AppData, []), OldIncludedDeps = proplists:get_value(included_applications, AppData, []), |