From 34b79c15c2f2de2fa514538b7ccb4b3c473808ae Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Wed, 6 Sep 2023 13:49:00 +0200 Subject: [PATCH] build: fix `depot_tools` patch application (#39742) build: fix depot_tools patch application --- .circleci/config/base.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.circleci/config/base.yml b/.circleci/config/base.yml index a4e476ccbc3f..6ea4a0bf1b8a 100644 --- a/.circleci/config/base.yml +++ b/.circleci/config/base.yml @@ -249,19 +249,19 @@ step-depot-tools-get: &step-depot-tools-get cd depot_tools cat > gclient.diff \<< 'EOF' diff --git a/gclient.py b/gclient.py - index 3a9c5c6..f222043 100755 + index c305c248..e6e0fbdc 100755 --- a/gclient.py +++ b/gclient.py - @@ -712,7 +712,8 @@ class Dependency(gclient_utils.WorkItem, DependencySettings): - - if dep_type == 'cipd': - cipd_root = self.GetCipdRoot() - - for package in dep_value.get('packages', []): - + packages = dep_value.get('packages', []) - + for package in (x for x in packages if "infra/3pp/tools/swift-format" not in x.get('package')): - deps_to_add.append( - CipdDependency( - parent=self, + @@ -735,7 +735,8 @@ class Dependency(gclient_utils.WorkItem, DependencySettings): + + if dep_type == 'cipd': + cipd_root = self.GetCipdRoot() + - for package in dep_value.get('packages', []): + + packages = dep_value.get('packages', []) + + for package in (x for x in packages if "infra/3pp/tools/swift-format" not in x.get('package')): + deps_to_add.append( + CipdDependency(parent=self, + name=name, EOF git apply --3way gclient.diff fi