From 58330b0db43d1b3ff7b94ea8f6dc67520af8621b Mon Sep 17 00:00:00 2001 From: Edward Lesmes Date: Fri, 6 Apr 2018 19:53:55 -0400 Subject: [PATCH] roll-dep: Use gclient_eval.GetRevision to get current revision. R=agable@chromium.org Bug: 760633 Change-Id: Iebabb417b5b1bd5a987de2707e84a0329e1ebe66 Reviewed-on: https://chromium-review.googlesource.com/1000758 Reviewed-by: Aaron Gable Commit-Queue: Edward Lesmes --- roll_dep.py | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/roll_dep.py b/roll_dep.py index ddd13cbca5..3c09f7af9a 100755 --- a/roll_dep.py +++ b/roll_dep.py @@ -134,19 +134,7 @@ def calculate_roll(full_dir, dependency, gclient_dict, roll_to): """Calculates the roll for a dependency by processing gclient_dict, and fetching the dependency via git. """ - if dependency not in gclient_dict['deps']: - raise Error( - '%s is not in the "deps" section of the DEPS file.' % dependency) - - head = None - if isinstance(gclient_dict['deps'][dependency], basestring): - _, _, head = gclient_dict['deps'][dependency].partition('@') - elif (isinstance(gclient_dict['deps'][dependency], collections.Mapping) - and 'url' in gclient_dict['deps'][dependency]): - _, _, head = gclient_dict['deps'][dependency]['url'].partition('@') - else: - raise Error('%s is not a valid git dependency.' % dependency) - + head = gclient_eval.GetRevision(gclient_dict, dependency) if not head: raise Error('%s is unpinned.' % dependency) check_call(['git', 'fetch', 'origin', '--quiet'], cwd=full_dir)