Commit 7f48c068 authored by phajdan@google.com's avatar phajdan@google.com

gclient: explicitly set checkout cwd for runhooks

BUG=chromium:596887
R=dsansome@chromium.org

Review URL: https://codereview.chromium.org/1956383002 .

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300503 0039d316-1c4b-4281-b951-d872f2087c98
parent 308b0f0a
...@@ -300,6 +300,7 @@ class GclientApi(recipe_api.RecipeApi): ...@@ -300,6 +300,7 @@ class GclientApi(recipe_api.RecipeApi):
def runhooks(self, args=None, name='runhooks', **kwargs): def runhooks(self, args=None, name='runhooks', **kwargs):
args = args or [] args = args or []
assert isinstance(args, (list, tuple)) assert isinstance(args, (list, tuple))
kwargs.setdefault('cwd', self.m.path['checkout'])
return self( return self(
name, ['runhooks'] + list(args), infra_step=False, **kwargs) name, ['runhooks'] + list(args), infra_step=False, **kwargs)
......
...@@ -159,6 +159,7 @@ ...@@ -159,6 +159,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks" "runhooks"
], ],
"cwd": "[SLAVE_BUILD]/src",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
......
...@@ -161,6 +161,7 @@ ...@@ -161,6 +161,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks" "runhooks"
], ],
"cwd": "[SLAVE_BUILD]/src",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
......
...@@ -172,6 +172,7 @@ ...@@ -172,6 +172,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks" "runhooks"
], ],
"cwd": "[SLAVE_BUILD]/src",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment