A bunch more little cleanups in bot_update.

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 130 matching lines @@
     # This is important for projects which are checked out as DEPS of the
     # gclient solution.
     self.m.gclient.set_patch_project_revision(
         self.m.properties.get('patch_project'), cfg)
 
     rev_map = cfg.got_revision_mapping.as_jsonish()
 
     flags = [
         # What do we want to check out (spec/root/rev/rev_map).
         ['--spec', self.m.gclient.config_to_pythonish(cfg)],
-        ['--root', root],
+        ['--patch_root', root],
         ['--revision_mapping_file', self.m.json.input(rev_map)],
         ['--git-cache-dir', cfg.cache_dir],
 
         # How to find the patch, if any (issue/patchset).
         ['--issue', issue],
         ['--patchset', patchset],
         ['--rietveld_server', rietveld or self._rietveld],
         ['--gerrit_repo', gerrit_repo],
         ['--gerrit_ref', gerrit_ref],
         ['--apply_issue_email_file', email_file],
@@ skipping 121 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