diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2015-06-10 14:37:17 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2015-06-10 14:37:17 +0200 |
| commit | d8f343b234174d49bc66d5bddbe79f24400868e6 (patch) | |
| tree | b2aa2f5a1cbc976f773b39d5d703070894ae446b /lib/kernel/src | |
| parent | 455ae616947dce6bd6b514226e98b50ef176fd83 (diff) | |
| parent | 2b48bda97f7773dea2bae6d2939bf74f9e6e10da (diff) | |
| download | otp-d8f343b234174d49bc66d5bddbe79f24400868e6.tar.gz otp-d8f343b234174d49bc66d5bddbe79f24400868e6.tar.bz2 otp-d8f343b234174d49bc66d5bddbe79f24400868e6.zip | |
Merge branch 'egil/fix-cover-error_logger/OTP-12818'
* egil/fix-cover-error_logger/OTP-12818:
cover: Unstick modules before loading remote
kernel: Add module name to sticky_dir error message
kernel: Remove ?line macros in error_logger_warn_SUITE
Diffstat (limited to 'lib/kernel/src')
| -rw-r--r-- | lib/kernel/src/code_server.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl index a4342715ef..eecd26863a 100644 --- a/lib/kernel/src/code_server.erl +++ b/lib/kernel/src/code_server.erl @@ -1259,7 +1259,7 @@ try_load_module(File, Mod, Bin, {From,_}=Caller, St0) -> try_load_module_1(File, Mod, Bin, Caller, #state{moddb=Db}=St) -> case is_sticky(Mod, Db) of true -> %% Sticky file reject the load - error_msg("Can't load module that resides in sticky dir\n",[]), + error_msg("Can't load module '~w' that resides in sticky dir\n",[Mod]), {reply,{error,sticky_directory},St}; false -> Architecture = erlang:system_info(hipe_architecture), |