From 990148ed24f058d28c3abc12eb9b3ef7ffc3c56e Mon Sep 17 00:00:00 2001 From: Edward Lesmes Date: Thu, 26 Apr 2018 14:56:55 -0400 Subject: [PATCH] gclient: Fix logic to match --patch-ref with dependencies. Accept cases when the origin in --patch-ref ends in .git but the URL in .gclient or DEPS doesn't. R=agable@chromium.org Bug: 643346 Change-Id: I25e6fd8400b09c7e249578cfbd7e9485bab9ea85 Reviewed-on: https://chromium-review.googlesource.com/1030893 Commit-Queue: Edward Lesmes Reviewed-by: Aaron Gable --- gclient.py | 2 ++ recipes/trigger_recipe_roller.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gclient.py b/gclient.py index 88319b670..0182222ee 100755 --- a/gclient.py +++ b/gclient.py @@ -958,6 +958,8 @@ class Dependency(gclient_utils.WorkItem, DependencySettings): return origin if origin.endswith('.git') and origin[:-len('.git')] in candidates: return origin[:-len('.git')] + if origin + '.git' in candidates: + return origin + '.git' if self.name in candidates: return self.name return None diff --git a/recipes/trigger_recipe_roller.txt b/recipes/trigger_recipe_roller.txt index 85019027f..1aeb41434 100644 --- a/recipes/trigger_recipe_roller.txt +++ b/recipes/trigger_recipe_roller.txt @@ -5,6 +5,6 @@ Once upon a time, a budding web browser dev team needed a CI system. All they had was one poor machine under a desk, and its name was Batty, the Build and Test Yeti. -Then suddenly, and without delay, Batty the Build and Test Yeti + 😒