Commit 7b54572e authored by Nodir Turakulov's avatar Nodir Turakulov Committed by Commit Bot

[gclient] Fix typo in get_gerrit_patch_root

https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1217670/17
used solution instead of solution name.

TBR=tandrii@chromium.org

Recipe-Nontrivial-Roll: build
Recipe-Nontrivial-Roll: infra
Bug: 694348
Change-Id: I829cba9223d73383791b018f9a23598443e8fa2c
Reviewed-on: https://chromium-review.googlesource.com/1231278Reviewed-by: 's avatarNodir Turakulov <nodir@chromium.org>
Reviewed-by: 's avatarAndrii Shyshkalov <tandrii@chromium.org>
Commit-Queue: Nodir Turakulov <nodir@chromium.org>
parent 0f322bfc
...@@ -248,7 +248,7 @@ Wrapper for easy calling of gclient steps. ...@@ -248,7 +248,7 @@ Wrapper for easy calling of gclient steps.
Remove all index.lock files. If a previous run of git crashed, bot was Remove all index.lock files. If a previous run of git crashed, bot was
reset, etc... we might end up with leftover index.lock files. reset, etc... we might end up with leftover index.lock files.
&mdash; **def [calculate\_patch\_root](/recipes/recipe_modules/gclient/api.py#360)(self, patch_project, gclient_config=None, patch_repo=None):** &mdash; **def [calculate\_patch\_root](/recipes/recipe_modules/gclient/api.py#362)(self, patch_project, gclient_config=None, patch_repo=None):**
Returns path where a patch should be applied to based patch_project. Returns path where a patch should be applied to based patch_project.
...@@ -287,8 +287,10 @@ or repo_path_map, returns name of the first solution. This is done solely ...@@ -287,8 +287,10 @@ or repo_path_map, returns name of the first solution. This is done solely
for backward compatibility with existing tests. for backward compatibility with existing tests.
Please do not rely on this logic in new code. Please do not rely on this logic in new code.
Instead, properly map a repository to a local path using repo_path_map. Instead, properly map a repository to a local path using repo_path_map.
TODO(nodir): remove this. Update all recipe tests to specify a git_repo
matching the recipe.
&mdash; **def [get\_repo\_path](/recipes/recipe_modules/gclient/api.py#330)(self, repo_url, gclient_config=None):** &mdash; **def [get\_repo\_path](/recipes/recipe_modules/gclient/api.py#332)(self, repo_url, gclient_config=None):**
Returns local path to the repo checkout given its url. Returns local path to the repo checkout given its url.
...@@ -327,7 +329,7 @@ Chromium config. This may happen for one of two reasons: ...@@ -327,7 +329,7 @@ Chromium config. This may happen for one of two reasons:
&mdash; **def [runhooks](/recipes/recipe_modules/gclient/api.py#264)(self, args=None, name='runhooks', \*\*kwargs):** &mdash; **def [runhooks](/recipes/recipe_modules/gclient/api.py#264)(self, args=None, name='runhooks', \*\*kwargs):**
&mdash; **def [set\_patch\_project\_revision](/recipes/recipe_modules/gclient/api.py#397)(self, patch_project, gclient_config=None):** &mdash; **def [set\_patch\_project\_revision](/recipes/recipe_modules/gclient/api.py#399)(self, patch_project, gclient_config=None):**
Updates config revision corresponding to patch_project. Updates config revision corresponding to patch_project.
......
...@@ -321,7 +321,7 @@ class GclientApi(recipe_api.RecipeApi): ...@@ -321,7 +321,7 @@ class GclientApi(recipe_api.RecipeApi):
root = self.get_repo_path(repo_url, gclient_config=cfg) root = self.get_repo_path(repo_url, gclient_config=cfg)
# This is wrong, but that's what a ton of recipe tests expect today # This is wrong, but that's what a ton of recipe tests expect today
root = root or cfg.solutions[0] root = root or cfg.solutions[0].name
return root return root
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment