Index: recipe_modules/bot_update/api.py |
diff --git a/recipe_modules/bot_update/api.py b/recipe_modules/bot_update/api.py |
index 1f93e61796eceaa2c0fd0047fa5043ada0da10d2..a494e8b318038cde2fe4db9c3e64bf5a744442c2 100644 |
--- a/recipe_modules/bot_update/api.py |
+++ b/recipe_modules/bot_update/api.py |
@@ -85,7 +85,8 @@ class BotUpdateApi(recipe_api.RecipeApi): |
# Construct our bot_update command. This basically be inclusive of |
# everything required for bot_update to know: |
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, |
# because it's hard to test this change without rolling into build |
# repository. |
@@ -94,13 +95,6 @@ class BotUpdateApi(recipe_api.RecipeApi): |
assert patch_project_roots is None |
root = self.m.gclient.calculate_patch_root( |
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: |
issue = issue or self._issue |