diff options
| author | Björn Gustavsson <[email protected]> | 2016-03-17 10:16:27 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2016-03-17 10:16:27 +0100 |
| commit | 28f3bae60a4edb9432c29469f6a3c031e0859104 (patch) | |
| tree | 852089f6c59811361af4cdabb652ac0892ec2967 /lib/kernel/src/code_server.erl | |
| parent | ae61174845dde2ddda537d57ace5b1124b7f4191 (diff) | |
| parent | 577125cc69feb5c14fa7e13edd3c3157f9c4a0ec (diff) | |
| download | otp-28f3bae60a4edb9432c29469f6a3c031e0859104.tar.gz otp-28f3bae60a4edb9432c29469f6a3c031e0859104.tar.bz2 otp-28f3bae60a4edb9432c29469f6a3c031e0859104.zip | |
Merge branch 'bjorn/kernel/code_server-normalized-paths/OTP-13410'
* bjorn/kernel/code_server-normalized-paths/OTP-13410:
code_server: Normalize the pathnames for all loaded modules
Update preloaded modules
init: Correct spec for fetch_loaded/1
Diffstat (limited to 'lib/kernel/src/code_server.erl')
| -rw-r--r-- | lib/kernel/src/code_server.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl index 6262407354..fb08b4c22b 100644 --- a/lib/kernel/src/code_server.erl +++ b/lib/kernel/src/code_server.erl @@ -67,7 +67,9 @@ init(Ref, Parent, [Root,Mode]) -> %% Pre-loaded modules are always sticky. ets:insert(Db, [{M,preloaded},{{sticky,M},true}]) end, erlang:pre_loaded()), - ets:insert(Db, init:fetch_loaded()), + Loaded0 = init:fetch_loaded(), + Loaded = [{M,filename:join([P])} || {M,P} <- Loaded0], %Normalize. + ets:insert(Db, Loaded), IPath = case Mode of |