| 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 slave import recipe_api | 8 from recipe_engine import recipe_api |
| 9 from slave import recipe_util | |
| 10 | 9 |
| 11 | 10 |
| 12 # This is just for testing, to indicate if a master is using a Git scheduler | 11 # This is just for testing, to indicate if a master is using a Git scheduler |
| 13 # or not. | 12 # or not. |
| 14 SVN_MASTERS = ( | 13 SVN_MASTERS = ( |
| 15 'experimental.svn', | 14 'experimental.svn', |
| 16 ) | 15 ) |
| 17 | 16 |
| 18 | 17 |
| 19 def jsonish_to_python(spec, is_top=False): | 18 def jsonish_to_python(spec, is_top=False): |
| (...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 | 229 |
| 231 # bot_update actually just sets root to be the folder name of the | 230 # bot_update actually just sets root to be the folder name of the |
| 232 # first solution. | 231 # first solution. |
| 233 if step_result.json.output['did_run']: | 232 if step_result.json.output['did_run']: |
| 234 co_root = step_result.json.output['root'] | 233 co_root = step_result.json.output['root'] |
| 235 cwd = kwargs.get('cwd', self.m.path['slave_build']) | 234 cwd = kwargs.get('cwd', self.m.path['slave_build']) |
| 236 if 'checkout' not in self.m.path: | 235 if 'checkout' not in self.m.path: |
| 237 self.m.path['checkout'] = cwd.join(*co_root.split(self.m.path.sep)) | 236 self.m.path['checkout'] = cwd.join(*co_root.split(self.m.path.sep)) |
| 238 | 237 |
| 239 return step_result | 238 return step_result |
| OLD | NEW |