1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-24 15:19:26 -05:00

Merge branch 'master' into master

This commit is contained in:
Max McDonnell 2018-06-01 15:20:38 -04:00 committed by GitHub
commit 571ad6f66a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions

3
os.go
View file

@ -143,9 +143,8 @@ func HandleCodeFetch(moduleSpecifier string, containingFile string) (out []byte)
}
var sourceCode = string(sourceCodeBuf)
var command = Msg_CODE_FETCH_RES
res = &Msg{
Command: command,
Command: Msg_CODE_FETCH_RES,
CodeFetchResModuleName: moduleName,
CodeFetchResFilename: filename,
CodeFetchResSourceCode: sourceCode,

View file

@ -149,7 +149,7 @@ export function resolveModule(
let fetchResponse;
try {
fetchResponse = os.codeFetch(moduleSpecifier, containingFile);
} catch(e) {
} catch (e) {
// TODO Only catch "no such file or directory" errors. Need error codes.
return null;
}