diff options
| author | Björn Gustavsson <[email protected]> | 2014-06-12 12:16:05 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2014-06-12 12:16:05 +0200 |
| commit | 5064e3d33eaf16a64dc99c0a86296f697640c09d (patch) | |
| tree | 457ff80e0c6d8f76c37a4a82a1a103695ac6e8f0 | |
| parent | 94dbdb22990cb97839e587e50287d92ecdb11cdf (diff) | |
| parent | bb6e764343e6cacc150f2233a0470a6194cca45d (diff) | |
| download | otp-5064e3d33eaf16a64dc99c0a86296f697640c09d.tar.gz otp-5064e3d33eaf16a64dc99c0a86296f697640c09d.tar.bz2 otp-5064e3d33eaf16a64dc99c0a86296f697640c09d.zip | |
Merge branch 'maint'
* maint:
Allow unsticking pre-loaded modules
| -rw-r--r-- | lib/kernel/src/code_server.erl | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl index dd06affd70..819554ce74 100644 --- a/lib/kernel/src/code_server.erl +++ b/lib/kernel/src/code_server.erl @@ -1168,7 +1168,7 @@ stick_dir(Dir, Stick, St) -> true -> foreach(fun (M) -> ets:insert(Db, {{sticky,M},true}) end, Mods); false -> - foreach(fun (M) -> do_unstick_mod(Db, M) end, Mods) + foreach(fun (M) -> ets:delete(Db, {sticky,M}) end, Mods) end; Error -> Error @@ -1180,15 +1180,6 @@ stick_mod(M, Stick, St) -> true -> ets:insert(Db, {{sticky,M},true}); false -> - do_unstick_mod(Db, M) - end. - -do_unstick_mod(Db, M) -> - case ets:lookup(Db, M) of - [{M,preloaded}] -> - %% Never unstick pre-loaded modules. - true; - _ -> ets:delete(Db, {sticky,M}) end. |