diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-14 17:41:05 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-04 12:37:36 +0000 |
commit | 399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (patch) | |
tree | 6b06b60ff365abef0e13b3503d593a0df48d20e8 /chromium/tools/roll_angle.py | |
parent | 7366110654eec46f21b6824f302356426f48cd74 (diff) | |
download | qtwebengine-chromium-399c965b6064c440ddcf4015f5f8e9d131c7a0a6.tar.gz |
BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1
Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/tools/roll_angle.py')
-rwxr-xr-x | chromium/tools/roll_angle.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/chromium/tools/roll_angle.py b/chromium/tools/roll_angle.py index 6432cc4a093..2b253ee56ee 100755 --- a/chromium/tools/roll_angle.py +++ b/chromium/tools/roll_angle.py @@ -102,7 +102,7 @@ def _GenerateCLDescriptionCommand(angle_current, angle_new, bugs, tbr): def GetBugString(bugs): bug_str = 'BUG=' for bug in bugs: - bug_str += str(bug) + ',' + bug_str += bug + ',' return bug_str.rstrip(',') if angle_current.git_commit != angle_new.git_commit: @@ -219,6 +219,7 @@ class AutoRoller(object): ['git','log', '%s..%s' % (angle_current.git_commit, angle_new.git_commit)], working_dir=working_dir).split('\n') + ignored_projects = set(['angleproject']) bugs = set() for line in lines: line = line.strip() @@ -226,12 +227,13 @@ class AutoRoller(object): if line.startswith(bug_prefix): bugs_strings = line[len(bug_prefix):].split(',') for bug_string in bugs_strings: - try: - bugs.add(int(bug_string)) - except: - # skip this, it may be a project specific bug such as - # "angleproject:X" or an ill-formed BUG= message - pass + ignore_bug = False + for ignored_project in ignored_projects: + if bug_string.startswith(ignored_project + ':'): + ignore_bug = True + break + if not ignore_bug: + bugs.add(bug_string) return bugs def _UpdateReadmeFile(self, readme_path, new_revision): |