tools/gn/function_read_file.cc - Issue 1155713006: GN: Make file/dir resolving return errors.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tools/gn/function_read_file.cc

Issue 1155713006: GN: Make file/dir resolving return errors. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: tools/gn/function_read_file.cc

diff --git a/tools/gn/function_read_file.cc b/tools/gn/function_read_file.cc

index 5a7662a672032596dc72b63baa9ea4bf67e9d37f..11585d8961531d8046a4531cc8cab1580a2ea12e 100644

--- a/tools/gn/function_read_file.cc

+++ b/tools/gn/function_read_file.cc

@@ -53,8 +53,10 @@ Value RunReadFile(Scope* scope,

// Compute the file name.

const SourceDir& cur_dir = scope->GetSourceDir();

- SourceFile source_file = cur_dir.ResolveRelativeFile(args[0].string_value(),

+ SourceFile source_file = cur_dir.ResolveRelativeFile(args[0], err,

scope->settings()->build_settings()->root_path_utf8());

+ if (err->has_error())

+ return Value();

base::FilePath file_path =

scope->settings()->build_settings()->GetFullPath(source_file);

« no previous file with comments | « tools/gn/function_get_path_info.cc ('k') | tools/gn/function_rebase_path.cc » ('j') | no next file with comments »