diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2016-11-09 11:31:01 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2016-11-09 11:31:01 +0100 |
| commit | 2bc52f6dd31d114b1a2d3cb7ad0a12b0b209beff (patch) | |
| tree | 152a8bcc9df4e45f585599d6e36d17824b2ee2da /erts/preloaded | |
| parent | ed42404dded81e6261a0fcd707c22e4bee4df059 (diff) | |
| parent | 2b41d8f318b7e5ec139d42fd2f01a132699be839 (diff) | |
| download | otp-2bc52f6dd31d114b1a2d3cb7ad0a12b0b209beff.tar.gz otp-2bc52f6dd31d114b1a2d3cb7ad0a12b0b209beff.tar.bz2 otp-2bc52f6dd31d114b1a2d3cb7ad0a12b0b209beff.zip | |
Merge branch 'maint-19' into maint
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/ebin/erl_prim_loader.beam | bin | 55752 -> 55804 bytes | |||
| -rw-r--r-- | erts/preloaded/src/erl_prim_loader.erl | 23 |
2 files changed, 12 insertions, 11 deletions
diff --git a/erts/preloaded/ebin/erl_prim_loader.beam b/erts/preloaded/ebin/erl_prim_loader.beam Binary files differindex 796cbd74c5..64d1a70e61 100644 --- a/erts/preloaded/ebin/erl_prim_loader.beam +++ b/erts/preloaded/ebin/erl_prim_loader.beam diff --git a/erts/preloaded/src/erl_prim_loader.erl b/erts/preloaded/src/erl_prim_loader.erl index b3ec73a60e..1d09aeded9 100644 --- a/erts/preloaded/src/erl_prim_loader.erl +++ b/erts/preloaded/src/erl_prim_loader.erl @@ -555,17 +555,18 @@ efile_gm_get(Paths, Mod, ParentRef, Process) -> efile_gm_get_1([P|Ps], File0, Mod, {Parent,Ref}=PR, Process) -> File = join(P, File0), - Res = try prim_file:read_file(File) of - {ok,Bin} -> - gm_process(Mod, File, Bin, Process); - Error -> - _ = check_file_result(get_modules, File, Error), - efile_gm_get_1(Ps, File0, Mod, PR, Process) - catch - _:Reason -> - {error,{crash,Reason}} - end, - Parent ! {Ref,Mod,Res}; + try prim_file:read_file(File) of + {ok,Bin} -> + Res = gm_process(Mod, File, Bin, Process), + Parent ! {Ref,Mod,Res}; + Error -> + _ = check_file_result(get_modules, File, Error), + efile_gm_get_1(Ps, File0, Mod, PR, Process) + catch + _:Reason -> + Res = {error,{crash,Reason}}, + Parent ! {Ref,Mod,Res} + end; efile_gm_get_1([], _, Mod, {Parent,Ref}, _Process) -> Parent ! {Ref,Mod,{error,enoent}}. |