diff --git a/tools_webrtc/autoroller/roll_deps.py b/tools_webrtc/autoroller/roll_deps.py index fb6a3155ae..bfbb828518 100755 --- a/tools_webrtc/autoroller/roll_deps.py +++ b/tools_webrtc/autoroller/roll_deps.py @@ -419,9 +419,11 @@ def CalculateChangedClang(new_cr_rev): def GenerateCommitMessage(rev_update, current_commit_pos, new_commit_pos, - changed_deps_list, clang_change=None, + changed_deps_list, added_deps_paths=None, - removed_deps_paths=None): + removed_deps_paths=None, + clang_change=None, + ): current_cr_rev = rev_update.current_chromium_rev[0:10] new_cr_rev = rev_update.new_chromium_rev[0:10] rev_interval = '%s..%s' % (current_cr_rev, new_cr_rev) @@ -683,12 +685,11 @@ def main(): raise RollError('WebRTC DEPS entries are missing from Chromium: %s. ' 'Remove them or add them to DONT_AUTOROLL_THESE.' % other_deps) clang_change = CalculateChangedClang(rev_update.new_chromium_rev) - commit_msg = GenerateCommitMessage(rev_update, - current_commit_pos, new_commit_pos, - changed_deps, - new_generated_android_deps, - removed_generated_android_deps, - clang_change) + commit_msg = GenerateCommitMessage( + rev_update, current_commit_pos, new_commit_pos, changed_deps, + added_deps_paths=new_generated_android_deps, + removed_deps_paths=removed_generated_android_deps, + clang_change=clang_change) logging.debug('Commit message:\n%s', commit_msg) _CreateRollBranch(opts.dry_run) diff --git a/tools_webrtc/autoroller/unittests/roll_deps_test.py b/tools_webrtc/autoroller/unittests/roll_deps_test.py index e9912f91ce..ccf042ecac 100755 --- a/tools_webrtc/autoroller/unittests/roll_deps_test.py +++ b/tools_webrtc/autoroller/unittests/roll_deps_test.py @@ -287,8 +287,7 @@ class TestRollChromiumRevision(unittest.TestCase): new_commit_pos = 'f00d' commit_msg = GenerateCommitMessage(NO_CHROMIUM_REVISION_UPDATE, current_commit_pos, new_commit_pos, - changed_deps, None, - added_paths, removed_paths) + changed_deps, added_paths, removed_paths) return [l.strip() for l in commit_msg.split('\n')]