diff options
| author | Erlang/OTP <[email protected]> | 2010-02-07 10:21:21 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-02-07 10:21:21 +0000 |
| commit | ea35770a586005025c770d514ffd4c3477075cf8 (patch) | |
| tree | 09061f4f9aaebd7a89388806b6ed12a692f31f0d /lib/kernel/src | |
| parent | c6bf34b7035a6292650babf2eb8af80c19256fab (diff) | |
| parent | c3902211043c449a2fc3830291ff2fd64d0cd4ee (diff) | |
| download | otp-ea35770a586005025c770d514ffd4c3477075cf8.tar.gz otp-ea35770a586005025c770d514ffd4c3477075cf8.tar.bz2 otp-ea35770a586005025c770d514ffd4c3477075cf8.zip | |
Merge branch 'ta/code_clash_ez' into ccase/r13b04_dev
* ta/code_clash_ez:
code_SUITE: add missing is_list(Config) guard
Add tests for code:clash/0
Fix handling of archive (.ez) files in code:clash/0
OTP-8413 code:clash/0 now looks inside archives (.ez files). (Thanks to
Tuncer Ayaz.)
Diffstat (limited to 'lib/kernel/src')
| -rw-r--r-- | lib/kernel/src/code.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/kernel/src/code.erl b/lib/kernel/src/code.erl index 89d893f8c1..ffe58ae7a9 100644 --- a/lib/kernel/src/code.erl +++ b/lib/kernel/src/code.erl @@ -465,7 +465,8 @@ search([{Dir, File} | Tail]) -> build([]) -> []; build([Dir|Tail]) -> - Files = filter(objfile_extension(), Dir, file:list_dir(Dir)), + Files = filter(objfile_extension(), Dir, + erl_prim_loader:list_dir(Dir)), [decorate(Files, Dir) | build(Tail)]. decorate([], _) -> []; |