diff options
author | Tristan Sloughter <[email protected]> | 2013-04-09 16:49:49 -0700 |
---|---|---|
committer | Tristan Sloughter <[email protected]> | 2013-04-09 16:49:49 -0700 |
commit | f34308e8f6f08ff3cb260481c7be90e0cbe76078 (patch) | |
tree | db506faa552a61997c08d01f27c785d51bf06eb7 /src/rcl_rel_discovery.erl | |
parent | bd20c04683b700027ed75c090c9d4534b40b3d47 (diff) | |
parent | 10eb471cda3609156e21af93e04522543fb674c0 (diff) | |
download | relx-f34308e8f6f08ff3cb260481c7be90e0cbe76078.tar.gz relx-f34308e8f6f08ff3cb260481c7be90e0cbe76078.tar.bz2 relx-f34308e8f6f08ff3cb260481c7be90e0cbe76078.zip |
Merge pull request #51 from ericbmerritt/next
various bugfixes to the system
Diffstat (limited to 'src/rcl_rel_discovery.erl')
-rw-r--r-- | src/rcl_rel_discovery.erl | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/rcl_rel_discovery.erl b/src/rcl_rel_discovery.erl index 38d7913..d9012ea 100644 --- a/src/rcl_rel_discovery.erl +++ b/src/rcl_rel_discovery.erl @@ -74,12 +74,13 @@ resolve_rel_metadata(State, LibDirs, AppMeta) -> case Errors of [] -> + ReleaseMeta1 = [RelMeta || {ok, RelMeta} <- ReleaseMeta0], rcl_log:debug(rcl_state:log(State), fun() -> ["Resolved the following OTP Releases from the system: \n", - [[rcl_release:format(1, Rel), "\n"] || Rel <- ReleaseMeta0]] + [[rcl_release:format(1, Rel), "\n"] || Rel <- ReleaseMeta1]] end), - {ok, ReleaseMeta0}; + {ok, ReleaseMeta1}; _ -> ?RCL_ERROR(Errors) end. @@ -105,10 +106,10 @@ discover_dir(File, AppMeta, file) -> | {error, Reason::term()} | {noresult, false}. is_valid_release(File, AppMeta) -> - case lists:suffix(".rel", File) of - true -> + case filename:extension(File) of + <<".rel">>-> resolve_release(File, AppMeta); - false -> + _ -> {noresult, false} end. |