patch_root hacks cleanup.

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 39 matching lines @@
     return self.m.python(name, bot_update_path, cmd, **kwargs)
 
   @property
   def last_returned_properties(self):
       return self._last_returned_properties
 
   def ensure_checkout(self, gclient_config=None, suffix=None,
                       patch=True, update_presentation=True,
                       force=False, patch_root=None, no_shallow=False,
                       with_branch_heads=False, refs=None,
-                      patch_project_roots=None, patch_oauth2=False,
+                      patch_oauth2=False,
                       output_manifest=True, clobber=False,
                       root_solution_revision=None, rietveld=None, issue=None,
                       patchset=None, gerrit_no_reset=False, **kwargs):
     """
     Args:
       gclient_config: The gclient configuration to use when running bot_update.
         If omitted, the current gclient configuration is used.
       rietveld: The rietveld server to use. If omitted, will infer from
         the 'rietveld' property.
       issue: The rietveld issue number to use. If omitted, will infer from
         the 'issue' property.
       patchset: The rietveld issue patchset to use. If omitted, will infer from
         the 'patchset' property.
     """
     refs = refs or []
     # We can re-use the gclient spec from the gclient module, since all the
     # data bot_update needs is already configured into the gclient spec.
     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' 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
+    if root is None:
       root = self.m.gclient.calculate_patch_root(
           self.m.properties.get('patch_project'), cfg)
 
     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:
@@ skipping 175 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