aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/src/code.erl
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2010-04-23 13:58:00 +0000
committerErlang/OTP <[email protected]>2010-04-23 13:58:00 +0000
commit01fcc37102224072adc1d9f90876aa32e8b62799 (patch)
treef604573ecab28293cce8058f429589d815ba6ffd /lib/kernel/src/code.erl
parent5411822647dc88b7b58725a25a2d5f626e8862f8 (diff)
parent7cca1066500448c2f061f0b1c9a2b04d185b1168 (diff)
downloadotp-01fcc37102224072adc1d9f90876aa32e8b62799.tar.gz
otp-01fcc37102224072adc1d9f90876aa32e8b62799.tar.bz2
otp-01fcc37102224072adc1d9f90876aa32e8b62799.zip
Merge branch 'ta/code_clash-filter-error' into dev
* ta/code_clash-filter-error: code:clash/0: match correct return value from erl_prim_loader:list_dir/1
Diffstat (limited to 'lib/kernel/src/code.erl')
-rw-r--r--lib/kernel/src/code.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kernel/src/code.erl b/lib/kernel/src/code.erl
index ffe58ae7a9..db05c1d234 100644
--- a/lib/kernel/src/code.erl
+++ b/lib/kernel/src/code.erl
@@ -473,7 +473,7 @@ decorate([], _) -> [];
decorate([File|Tail], Dir) ->
[{Dir, File} | decorate(Tail, Dir)].
-filter(_Ext, Dir, {error,_}) ->
+filter(_Ext, Dir, error) ->
io:format("** Bad path can't read ~s~n", [Dir]), [];
filter(Ext, _, {ok,Files}) ->
filter2(Ext, length(Ext), Files).