| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 | 5 |
| 6 """Recipe module to ensure a checkout is consistant on a bot.""" | 6 """Recipe module to ensure a checkout is consistant on a bot.""" |
| 7 | 7 |
| 8 from recipe_engine import recipe_api | 8 from recipe_engine import recipe_api |
| 9 | 9 |
| 10 | 10 |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 134 flags = [ | 134 flags = [ |
| 135 # 1. Do we want to run? (master/builder/slave). | 135 # 1. Do we want to run? (master/builder/slave). |
| 136 ['--master', master], | 136 ['--master', master], |
| 137 ['--builder', builder], | 137 ['--builder', builder], |
| 138 ['--slave', slave], | 138 ['--slave', slave], |
| 139 | 139 |
| 140 # 2. What do we want to check out (spec/root/rev/rev_map). | 140 # 2. What do we want to check out (spec/root/rev/rev_map). |
| 141 ['--spec', spec_string], | 141 ['--spec', spec_string], |
| 142 ['--root', root], | 142 ['--root', root], |
| 143 ['--revision_mapping_file', self.m.json.input(rev_map)], | 143 ['--revision_mapping_file', self.m.json.input(rev_map)], |
| 144 ['--git-cache-dir', self.m.path['git_cache']], |
| 144 | 145 |
| 145 # 3. How to find the patch, if any (issue/patchset/patch_url). | 146 # 3. How to find the patch, if any (issue/patchset/patch_url). |
| 146 ['--issue', issue], | 147 ['--issue', issue], |
| 147 ['--patchset', patchset], | 148 ['--patchset', patchset], |
| 148 ['--patch_url', patch_url], | 149 ['--patch_url', patch_url], |
| 149 ['--rietveld_server', self.m.properties.get('rietveld')], | 150 ['--rietveld_server', self.m.properties.get('rietveld')], |
| 150 ['--gerrit_repo', gerrit_repo], | 151 ['--gerrit_repo', gerrit_repo], |
| 151 ['--gerrit_ref', gerrit_ref], | 152 ['--gerrit_ref', gerrit_ref], |
| 152 ['--apply_issue_email_file', email_file], | 153 ['--apply_issue_email_file', email_file], |
| 153 ['--apply_issue_key_file', key_file], | 154 ['--apply_issue_key_file', key_file], |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 267 | 268 |
| 268 # bot_update actually just sets root to be the folder name of the | 269 # bot_update actually just sets root to be the folder name of the |
| 269 # first solution. | 270 # first solution. |
| 270 if step_result.json.output['did_run']: | 271 if step_result.json.output['did_run']: |
| 271 co_root = step_result.json.output['root'] | 272 co_root = step_result.json.output['root'] |
| 272 cwd = kwargs.get('cwd', self.m.path['slave_build']) | 273 cwd = kwargs.get('cwd', self.m.path['slave_build']) |
| 273 if 'checkout' not in self.m.path: | 274 if 'checkout' not in self.m.path: |
| 274 self.m.path['checkout'] = cwd.join(*co_root.split(self.m.path.sep)) | 275 self.m.path['checkout'] = cwd.join(*co_root.split(self.m.path.sep)) |
| 275 | 276 |
| 276 return step_result | 277 return step_result |
| OLD | NEW |