diff options
| author | Erland Schönbeck <[email protected]> | 2014-07-11 11:09:09 +0200 |
|---|---|---|
| committer | Erland Schönbeck <[email protected]> | 2014-07-11 11:09:09 +0200 |
| commit | 9a1419a7d4325085dc2235a8531d77e1d96ea689 (patch) | |
| tree | ebb7ed16ce92c1c99b44091bee9e4d2a7220ef75 /lib/kernel/src | |
| parent | a56f6e3e716c4a2c8f16933e1e30759381c4fdb8 (diff) | |
| parent | 934b6de4d2ab6c31c5217e1ba4779ade9e37cc83 (diff) | |
| download | otp-9a1419a7d4325085dc2235a8531d77e1d96ea689.tar.gz otp-9a1419a7d4325085dc2235a8531d77e1d96ea689.tar.bz2 otp-9a1419a7d4325085dc2235a8531d77e1d96ea689.zip | |
Merge branch 'maint-17' into maint
Diffstat (limited to 'lib/kernel/src')
| -rw-r--r-- | lib/kernel/src/erl_boot_server.erl | 6 | ||||
| -rw-r--r-- | lib/kernel/src/kernel.app.src | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/kernel/src/erl_boot_server.erl b/lib/kernel/src/erl_boot_server.erl index 9a49655a9f..ef09d86ca4 100644 --- a/lib/kernel/src/erl_boot_server.erl +++ b/lib/kernel/src/erl_boot_server.erl @@ -341,9 +341,13 @@ handle_command(S, PS, Msg) -> send_file_result(S, list_dir, Res), PS2; {read_file_info,File} -> - {Res, PS2} = erl_prim_loader:prim_read_file_info(PS, File), + {Res, PS2} = erl_prim_loader:prim_read_file_info(PS, File, true), send_file_result(S, read_file_info, Res), PS2; + {read_link_info,File} -> + {Res, PS2} = erl_prim_loader:prim_read_file_info(PS, File, false), + send_file_result(S, read_link_info, Res), + PS2; get_cwd -> {Res, PS2} = erl_prim_loader:prim_get_cwd(PS, []), send_file_result(S, get_cwd, Res), diff --git a/lib/kernel/src/kernel.app.src b/lib/kernel/src/kernel.app.src index 5658c6b6cf..9f6c0f4624 100644 --- a/lib/kernel/src/kernel.app.src +++ b/lib/kernel/src/kernel.app.src @@ -115,6 +115,6 @@ {applications, []}, {env, [{error_logger, tty}]}, {mod, {kernel, []}}, - {runtime_dependencies, ["erts-6.0", "stdlib-2.0", "sasl-2.4"]} + {runtime_dependencies, ["erts-6.1.2", "stdlib-2.0", "sasl-2.4"]} ] }. |