From 28190a2f3575e3d472642ed403460d4db4762dda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erg=C3=BCn=20Erdo=C4=9Fmu=C5=9F?= Date: Wed, 22 Jun 2022 08:50:54 +0000 Subject: [PATCH] Fix not creating GNArgs file when there are multiple dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: 1336227 Change-Id: I53a13b452829f280816cc07a0907958348c23d56 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3702359 Commit-Queue: Ergün Erdoğmuş Reviewed-by: Aravind Vasudevan --- gclient.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gclient.py b/gclient.py index 812cfbd23..f100cd22f 100755 --- a/gclient.py +++ b/gclient.py @@ -1855,12 +1855,13 @@ it or fix the checkout. # Once all the dependencies have been processed, it's now safe to write # out the gn_args_file and run the hooks. if command == 'update': - gn_args_dep = self.dependencies[0] - if gn_args_dep._gn_args_from: - deps_map = {dep.name: dep for dep in gn_args_dep.dependencies} - gn_args_dep = deps_map.get(gn_args_dep._gn_args_from) - if gn_args_dep and gn_args_dep.HasGNArgsFile(): - gn_args_dep.WriteGNArgsFile() + for dependency in self.dependencies: + gn_args_dep = dependency + if gn_args_dep._gn_args_from: + deps_map = {dep.name: dep for dep in gn_args_dep.dependencies} + gn_args_dep = deps_map.get(gn_args_dep._gn_args_from) + if gn_args_dep and gn_args_dep.HasGNArgsFile(): + gn_args_dep.WriteGNArgsFile() self._RemoveUnversionedGitDirs()