LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a crash when a brand new file is added.

Browse Source 
Checkstyle.py was not handling additions of new files resulting in
a crash. For new files git.modified_lines() returns None. Added code
handles that case.

Bug: 25852971
Change-Id: I91e2b8c92581ec9e89bcbbcd2d274f56c791f3a9
(cherry picked from commit 5b87dbad0c)
This commit is contained in:
Aurimas Liutikas
2015-12-15 18:02:50 -08:00
parent 1fc79c2192
commit 4e8bad8045
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/checkstyle/checkstyle.py
View File

@@ -106,9 +106,9 @@ def _ParseAndFilterOutput(stdout, sha, last_commit_modified_files):
file_name = os.path.relpath(file_name) file_name = os.path.relpath(file_name)
errors = file_element.getElementsByTagName('error') errors = file_element.getElementsByTagName('error')
for error in errors: for error in errors:
line = error.attributes['line'].value line = int(error.attributes['line'].value)
if last_commit_modified_files and int(line) not in modified_lines: rule = error.attributes['source'].value
if error.attributes['source'].value not in FORCED_RULES: if last_commit_modified_files and _ShouldSkip(modified_lines, line, rule):
continue continue
column = '' column = ''
@@ -125,6 +125,12 @@ def _ParseAndFilterOutput(stdout, sha, last_commit_modified_files):
return (result_errors, result_warnings) return (result_errors, result_warnings)
# Returns whether an error on a given line should be skipped
# based on the modified_lines list and the rule.
def _ShouldSkip(modified_lines, line, rule):
return modified_lines and line not in modified_lines and rule not in FORCED_RULES
def _GetModifiedFiles(): def _GetModifiedFiles():
root = git.repository_root() root = git.repository_root()
sha = git.last_commit() sha = git.last_commit()