Commit c1e6594d authored by Robert Iannucci's avatar Robert Iannucci Committed by Commit Bot

[roll-dep] Use Bug: instead of BUG=

This is the more modern syntax and everything should already work with
it.

R=tandrii@chromium.org

Change-Id: I7acbe6cc7c663e03e9a72c2b6c155a7982477146
Reviewed-on: https://chromium-review.googlesource.com/c/1289233
Auto-Submit: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: 's avatarEdward Lesmes <ehmaldonado@chromium.org>
parent e660e3fb
...@@ -142,7 +142,7 @@ def calculate_roll(full_dir, dependency, gclient_dict, roll_to): ...@@ -142,7 +142,7 @@ def calculate_roll(full_dir, dependency, gclient_dict, roll_to):
return head, roll_to return head, roll_to
def gen_commit_msg(logs, cmdline, rolls, reviewers, bug): def gen_commit_msg(logs, cmdline, reviewers, bug):
"""Returns the final commit message.""" """Returns the final commit message."""
commit_msg = '' commit_msg = ''
if len(logs) > 1: if len(logs) > 1:
...@@ -150,11 +150,11 @@ def gen_commit_msg(logs, cmdline, rolls, reviewers, bug): ...@@ -150,11 +150,11 @@ def gen_commit_msg(logs, cmdline, rolls, reviewers, bug):
commit_msg += '\n\n'.join(logs) commit_msg += '\n\n'.join(logs)
commit_msg += '\nCreated with:\n ' + cmdline + '\n' commit_msg += '\nCreated with:\n ' + cmdline + '\n'
commit_msg += 'R=%s\n' % ','.join(reviewers) if reviewers else '' commit_msg += 'R=%s\n' % ','.join(reviewers) if reviewers else ''
commit_msg += 'BUG=%s\n' % bug if bug else '' commit_msg += '\nBug: %s\n' % bug if bug else ''
return commit_msg return commit_msg
def finalize(commit_msg, deps_path, deps_content, rolls, is_relative, root_dir): def finalize(commit_msg, deps_path, deps_content, rolls, root_dir):
"""Edits the DEPS file, commits it, then uploads a CL.""" """Edits the DEPS file, commits it, then uploads a CL."""
print('Commit message:') print('Commit message:')
print('\n'.join(' ' + i for i in commit_msg.splitlines())) print('\n'.join(' ' + i for i in commit_msg.splitlines()))
...@@ -254,8 +254,8 @@ def main(): ...@@ -254,8 +254,8 @@ def main():
deps_content = gclient_eval.RenderDEPSFile(gclient_dict) deps_content = gclient_eval.RenderDEPSFile(gclient_dict)
commit_msg = gen_commit_msg(logs, cmdline, rolls, reviewers, args.bug) commit_msg = gen_commit_msg(logs, cmdline, reviewers, args.bug)
finalize(commit_msg, deps_path, deps_content, rolls, is_relative, root_dir) finalize(commit_msg, deps_path, deps_content, rolls, root_dir)
except Error as e: except Error as e:
sys.stderr.write('error: %s\n' % e) sys.stderr.write('error: %s\n' % e)
return 2 if isinstance(e, AlreadyRolledError) else 1 return 2 if isinstance(e, AlreadyRolledError) else 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment