Commit e0b49314 authored by tandrii@chromium.org's avatar tandrii@chromium.org

patch_root cleanup: transition everyone to new code.

This doesn't create recipe expectations changes.

Depends: https://codereview.chromium.org/1920903002/
Allows: https://codereview.chromium.org/1913863002

R=machenbach@chromium.org,phajdan.jr@chromium.org
BUG=605563

Review URL: https://codereview.chromium.org/1919863003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300150 0039d316-1c4b-4281-b951-d872f2087c98
parent cb3fd431
...@@ -85,7 +85,8 @@ class BotUpdateApi(recipe_api.RecipeApi): ...@@ -85,7 +85,8 @@ class BotUpdateApi(recipe_api.RecipeApi):
# Construct our bot_update command. This basically be inclusive of # Construct our bot_update command. This basically be inclusive of
# everything required for bot_update to know: # everything required for bot_update to know:
root = patch_root root = patch_root
if root == 'TODO(TANDRII): REMOVE THIS TRANSITION TO patch_projects': if (root == 'TODO(TANDRII): REMOVE THIS TRANSITION TO patch_projects' or
root is None):
# This special condition is here for initial rollout of this code, # This special condition is here for initial rollout of this code,
# because it's hard to test this change without rolling into build # because it's hard to test this change without rolling into build
# repository. # repository.
...@@ -94,13 +95,6 @@ class BotUpdateApi(recipe_api.RecipeApi): ...@@ -94,13 +95,6 @@ class BotUpdateApi(recipe_api.RecipeApi):
assert patch_project_roots is None assert patch_project_roots is None
root = self.m.gclient.calculate_patch_root( root = self.m.gclient.calculate_patch_root(
self.m.properties.get('patch_project'), cfg) self.m.properties.get('patch_project'), cfg)
# TODO(tandrii): get rid the condition below after transition.
if root is None:
root = cfg.solutions[0].name
additional = self.m.rietveld.calculate_issue_root(patch_project_roots)
if additional:
root = self.m.path.join(root, additional)
if patch: if patch:
issue = issue or self._issue issue = issue or self._issue
......
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