From 1f254740385d3048f75c0e572993a5a0774e0f0f Mon Sep 17 00:00:00 2001 From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com> Date: Fri, 7 Jun 2024 09:26:00 -0400 Subject: [PATCH] build: fix `depot_tools` patch (#42407) Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr --- .circleci/config/base.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config/base.yml b/.circleci/config/base.yml index b1f1bb7e633e..39e1dfa335ce 100644 --- a/.circleci/config/base.yml +++ b/.circleci/config/base.yml @@ -260,9 +260,9 @@ step-depot-tools-get: &step-depot-tools-get index c305c248..e6e0fbdc 100755 --- a/gclient.py +++ b/gclient.py - @@ -735,7 +735,8 @@ class Dependency(gclient_utils.WorkItem, DependencySettings): - - if dep_type == 'cipd': + @@ -783,7 +783,8 @@ class Dependency(gclient_utils.WorkItem, DependencySettings): + not condition or "non_git_source" not in condition): + continue cipd_root = self.GetCipdRoot() - for package in dep_value.get('packages', []): + packages = dep_value.get('packages', [])