From c99bddfc1c38c67f709d821bc82ba21a9c889165 Mon Sep 17 00:00:00 2001 From: kjellander Date: Mon, 15 May 2017 02:40:58 -0700 Subject: [PATCH] Autoroller: Skip commit if there are no DEPS changes. This will avoid failing with a non-zero exit code when git commit fails due to no changes to be rolled. BUG=None NOTRY=True Review-Url: https://codereview.webrtc.org/2883833003 Cr-Commit-Position: refs/heads/master@{#18146} --- tools_webrtc/autoroller/roll_deps.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools_webrtc/autoroller/roll_deps.py b/tools_webrtc/autoroller/roll_deps.py index 810cfc4643..0d87fdc805 100755 --- a/tools_webrtc/autoroller/roll_deps.py +++ b/tools_webrtc/autoroller/roll_deps.py @@ -472,9 +472,12 @@ def main(): _CreateRollBranch(opts.dry_run) UpdateDepsFile(deps_filename, current_cr_rev, new_cr_rev, changed_deps) - _LocalCommit(commit_msg, opts.dry_run) - _UploadCL(opts.dry_run, opts.rietveld_email) - _SendToCQ(opts.dry_run, opts.skip_cq) + if _IsTreeClean(): + logging.info("No DEPS changes detected, skipping CL creation.") + else: + _LocalCommit(commit_msg, opts.dry_run) + _UploadCL(opts.dry_run, opts.rietveld_email) + _SendToCQ(opts.dry_run, opts.skip_cq) return 0