| Index: recipe_modules/gclient/api.py
|
| diff --git a/recipe_modules/gclient/api.py b/recipe_modules/gclient/api.py
|
| index 2d9ed949f5f72d6c78cd16552648245fc63fce81..83578a843d416c7bd0cd907c8439dd7b1ccee25e 100644
|
| --- a/recipe_modules/gclient/api.py
|
| +++ b/recipe_modules/gclient/api.py
|
| @@ -134,7 +134,7 @@ class GclientApi(recipe_api.RecipeApi):
|
| def get_config_defaults(self):
|
| return {
|
| 'USE_MIRROR': self.use_mirror,
|
| - 'CACHE_DIR': self.m.path['git_cache'],
|
| + 'CACHE_DIR': self.m.infra_paths['git_cache'],
|
| }
|
|
|
| @staticmethod
|
| @@ -275,7 +275,7 @@ class GclientApi(recipe_api.RecipeApi):
|
| self(name, ['recurse', 'git', 'config', var, val], **kwargs)
|
|
|
| finally:
|
| - cwd = kwargs.get('cwd', self.m.path['slave_build'])
|
| + cwd = kwargs.get('cwd', self.m.infra_paths['slave_build'])
|
| if 'checkout' not in self.m.path:
|
| self.m.path['checkout'] = cwd.join(
|
| *cfg.solutions[0].name.split(self.m.path.sep))
|
| @@ -289,9 +289,13 @@ class GclientApi(recipe_api.RecipeApi):
|
| prefix = '%sgclient ' % (('[spec: %s] ' % alias) if alias else '')
|
|
|
| return self.m.python(prefix + 'revert',
|
| - self.m.path['build'].join('scripts', 'slave', 'gclient_safe_revert.py'),
|
| - ['.', self.m.path['depot_tools'].join('gclient',
|
| - platform_ext={'win': '.bat'})],
|
| + self.m.infra_paths['build'].join(
|
| + 'scripts', 'slave', 'gclient_safe_revert.py'),
|
| + [
|
| + '.',
|
| + self.m.infra_paths['depot_tools'].join(
|
| + 'gclient', platform_ext={'win': '.bat'})
|
| + ],
|
| infra_step=True,
|
| **kwargs
|
| )
|
| @@ -333,6 +337,6 @@ class GclientApi(recipe_api.RecipeApi):
|
| print 'deleting %s' % path_to_file
|
| os.remove(path_to_file)
|
| """,
|
| - args=[self.m.path['slave_build']],
|
| + args=[self.m.infra_paths['slave_build']],
|
| infra_step=True,
|
| )
|
|
|