patch_root cleanup: transition everyone to new code.

recipe_modules/bot_update/api.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 """Recipe module to ensure a checkout is consistant on a bot."""
 
 from recipe_engine import recipe_api
 
 
@@ skipping 67 matching lines @@
     cfg = gclient_config or self.m.gclient.c
 
     # Used by bot_update to determine if we want to run or not.
     master = self._mastername
     builder = self._buildername
     slave = self._slavename
 
     # 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.
       # After the switch to new code is complete, this special TODOstring will
       # be removed in favor of "root is None"
       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
       patchset = patchset or self._patchset
       patch_url = self._patch_url
       gerrit_repo = self._repository
       gerrit_ref = self._gerrit_ref
     else:
       # The trybot recipe sometimes wants to de-apply the patch. In which case
       # we pretend the issue/patchset/patch_url never existed.
@@ skipping 173 matching lines @@
 
       # bot_update actually just sets root to be the folder name of the
       # first solution.
       if step_result.json.output['did_run']:
         co_root = step_result.json.output['root']
         cwd = kwargs.get('cwd', self.m.path['slave_build'])
         if 'checkout' not in self.m.path:
           self.m.path['checkout'] = cwd.join(*co_root.split(self.m.path.sep))
 
     return step_result