From f26abf827dc2dd11076544f1e7fab057eef78ad8 Mon Sep 17 00:00:00 2001 From: Oleh Prypin Date: Wed, 4 Apr 2018 10:48:34 +0200 Subject: [PATCH] Migrate autoroller from roll-dep-svn to gclient setdep MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit No-Try: True Bug: webrtc:9104 Change-Id: I049231e24de1f789aad44c6639e43e291cee0854 Reviewed-on: https://webrtc-review.googlesource.com/66681 Reviewed-by: Patrik Höglund Commit-Queue: Oleh Prypin Cr-Commit-Position: refs/heads/master@{#22725} --- tools_webrtc/autoroller/roll_deps.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tools_webrtc/autoroller/roll_deps.py b/tools_webrtc/autoroller/roll_deps.py index 6f1239c391..f2a412dd1b 100755 --- a/tools_webrtc/autoroller/roll_deps.py +++ b/tools_webrtc/autoroller/roll_deps.py @@ -354,11 +354,9 @@ def UpdateDepsFile(deps_filename, old_cr_revision, new_cr_revision, 'platforms in the target_os list, i.e.\n' 'target_os = ["android", "unix", "mac", "ios", "win"];\n' 'Then run "gclient sync" again.' % local_dep_dir) - _, stderr = _RunCommand( - ['roll-dep-svn', '--no-verify-revision', dep.path, dep.new_rev], - working_dir=CHECKOUT_SRC_DIR, ignore_exit_code=True) - if stderr: - logging.warning('roll-dep-svn: %s', stderr) + _RunCommand( + ['gclient', 'setdep', '--revision', '%s@%s' % (dep.path, dep.new_rev)], + working_dir=CHECKOUT_SRC_DIR) def _IsTreeClean():