Issue 9168014: Fix incorrectly resolved conflict, and add error message for missing sources.

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

Issue 9168014: Fix incorrectly resolved conflict, and add error message for missing sources. (Closed)

Created:
8 years, 11 months ago by noelallen1

Modified:
8 years, 11 months ago

Reviewers:
sehr (please use chromium)

CC:
chromium-reviews

Base URL:
svn://chrome-svn/chrome/trunk/src/

Visibility:
Public.

More Reviews

Description

Fix incorrectly resolved conflict, and add error message for missing sources. When running the generator with default arguments from a CWD other than the script's directory, the default arguments will be incorrect. This adds a check which will print an error message and fail. If any argument, including the default arguments are provided on the command-line, then this check is bypassed. BUG=109177 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=117547

Patch Set 1 #

Created: 8 years, 11 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Stats (+17 lines, -9 lines)			Patch
M	ppapi/generators/generator.py	View	2 chunks	+10 lines, -1 line	0 comments	Download
M	ppapi/generators/idl_c_header.py	View	2 chunks	+2 lines, -4 lines	0 comments	Download
M	ppapi/generators/idl_generator.py	View	1 chunk	+1 line, -2 lines	0 comments	Download
M	ppapi/generators/idl_node.py	View	1 chunk	+1 line, -2 lines	0 comments	Download
M	ppapi/generators/idl_parser.py	View	1 chunk	+3 lines, -0 lines	0 comments	Download

Messages

Total messages: 2 (0 generated)

Expand Messages | Collapse Messages

lgtm

Expand Messages | Collapse Messages