From 32645dfee909a3cff9db2f98c25e3e5c0c305b0d Mon Sep 17 00:00:00 2001 From: Ravi Mistry Date: Tue, 22 Feb 2022 21:02:21 +0000 Subject: [PATCH] Replace python3 with vpython3 in gclient/api.py For context see comments 5 and 6 here: https://bugs.chromium.org/p/chromium/issues/detail?id=1298922#c6 Recipe-Nontrivial-Roll: build Recipe-Nontrivial-Roll: build_limited Recipe-Nontrivial-Roll: chrome_release Recipe-Nontrivial-Roll: chromiumos Recipe-Nontrivial-Roll: infra Bug: chromium:1298922 Change-Id: Id424cec27ca64ac0c2e746d54edf044820915cd8 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3480835 Reviewed-by: Josip Sokcevic Commit-Queue: Ravi Mistry --- recipes/recipe_modules/gclient/api.py | 2 +- .../gclient/examples/full.expected/basic.json | 18 +++++++++--------- .../examples/full.expected/revision.json | 18 +++++++++--------- .../examples/full.expected/tryserver.json | 18 +++++++++--------- .../tests/diff_deps.expected/basic.json | 2 +- .../dont have revision yet.json | 2 +- .../no change, exception.json | 2 +- .../tests/diff_deps.expected/windows.json | 2 +- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/recipes/recipe_modules/gclient/api.py b/recipes/recipe_modules/gclient/api.py index 758ed0e7c..92b4ee2b6 100644 --- a/recipes/recipe_modules/gclient/api.py +++ b/recipes/recipe_modules/gclient/api.py @@ -100,7 +100,7 @@ class GclientApi(recipe_api.RecipeApi): self.m.buildbucket.build.builder.builder, self.m.buildbucket.build.id) with self.m.context(env=env, env_suffixes=env_suffixes): - cmd = ['python3', '-u', self.repo_resource('gclient.py')] + cmd + cmd = ['vpython3', '-u', self.repo_resource('gclient.py')] + cmd return self.m.step(prefix + name, cmd, infra_step=infra_step, diff --git a/recipes/recipe_modules/gclient/examples/full.expected/basic.json b/recipes/recipe_modules/gclient/examples/full.expected/basic.json index 74f6f075d..6a78985ad 100644 --- a/recipes/recipe_modules/gclient/examples/full.expected/basic.json +++ b/recipes/recipe_modules/gclient/examples/full.expected/basic.json @@ -1,7 +1,7 @@ [ { "cmd": [ - "python3", + "vpython3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "config", @@ -18,7 +18,7 @@ }, { "cmd": [ - "python3", + "vpython3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "sync", @@ -55,7 +55,7 @@ }, { "cmd": [ - "python3", + "vpython3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "recurse", @@ -74,7 +74,7 @@ }, { "cmd": [ - "python3", + "vpython3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "recurse", @@ -93,7 +93,7 @@ }, { "cmd": [ - "python3", + "vpython3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "config", @@ -111,7 +111,7 @@ }, { "cmd": [ - "python3", + "vpython3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "sync", @@ -155,7 +155,7 @@ }, { "cmd": [ - "python3", + "vpython3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "recurse", @@ -175,7 +175,7 @@ }, { "cmd": [ - "python3", + "vpython3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "recurse", @@ -220,7 +220,7 @@ }, { "cmd": [ - "python3", + "vpython3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "runhooks" diff --git a/recipes/recipe_modules/gclient/examples/full.expected/revision.json b/recipes/recipe_modules/gclient/examples/full.expected/revision.json index f9d42ee46..d9a856998 100644 --- a/recipes/recipe_modules/gclient/examples/full.expected/revision.json +++ b/recipes/recipe_modules/gclient/examples/full.expected/revision.json @@ -1,7 +1,7 @@ [ { "cmd": [ - "python3", + "vpython3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "config", @@ -33,7 +33,7 @@ }, { "cmd": [ - "python3", + "vpython3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "sync", @@ -87,7 +87,7 @@ }, { "cmd": [ - "python3", + "vpython3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "recurse", @@ -121,7 +121,7 @@ }, { "cmd": [ - "python3", + "vpython3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "recurse", @@ -155,7 +155,7 @@ }, { "cmd": [ - "python3", + "vpython3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "config", @@ -188,7 +188,7 @@ }, { "cmd": [ - "python3", + "vpython3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "sync", @@ -247,7 +247,7 @@ }, { "cmd": [ - "python3", + "vpython3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "recurse", @@ -282,7 +282,7 @@ }, { "cmd": [ - "python3", + "vpython3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "recurse", @@ -354,7 +354,7 @@ }, { "cmd": [ - "python3", + "vpython3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "runhooks" diff --git a/recipes/recipe_modules/gclient/examples/full.expected/tryserver.json b/recipes/recipe_modules/gclient/examples/full.expected/tryserver.json index 4771fd068..3062f0d9f 100644 --- a/recipes/recipe_modules/gclient/examples/full.expected/tryserver.json +++ b/recipes/recipe_modules/gclient/examples/full.expected/tryserver.json @@ -1,7 +1,7 @@ [ { "cmd": [ - "python3", + "vpython3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "config", @@ -33,7 +33,7 @@ }, { "cmd": [ - "python3", + "vpython3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "sync", @@ -85,7 +85,7 @@ }, { "cmd": [ - "python3", + "vpython3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "recurse", @@ -119,7 +119,7 @@ }, { "cmd": [ - "python3", + "vpython3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "recurse", @@ -153,7 +153,7 @@ }, { "cmd": [ - "python3", + "vpython3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "config", @@ -186,7 +186,7 @@ }, { "cmd": [ - "python3", + "vpython3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "sync", @@ -245,7 +245,7 @@ }, { "cmd": [ - "python3", + "vpython3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "recurse", @@ -280,7 +280,7 @@ }, { "cmd": [ - "python3", + "vpython3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "recurse", @@ -352,7 +352,7 @@ }, { "cmd": [ - "python3", + "vpython3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "runhooks" diff --git a/recipes/recipe_modules/gclient/tests/diff_deps.expected/basic.json b/recipes/recipe_modules/gclient/tests/diff_deps.expected/basic.json index 6e6c76dfa..24276f3fe 100644 --- a/recipes/recipe_modules/gclient/tests/diff_deps.expected/basic.json +++ b/recipes/recipe_modules/gclient/tests/diff_deps.expected/basic.json @@ -27,7 +27,7 @@ }, { "cmd": [ - "python3", + "vpython3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "recurse", diff --git a/recipes/recipe_modules/gclient/tests/diff_deps.expected/dont have revision yet.json b/recipes/recipe_modules/gclient/tests/diff_deps.expected/dont have revision yet.json index 04e47e394..bb279262a 100644 --- a/recipes/recipe_modules/gclient/tests/diff_deps.expected/dont have revision yet.json +++ b/recipes/recipe_modules/gclient/tests/diff_deps.expected/dont have revision yet.json @@ -27,7 +27,7 @@ }, { "cmd": [ - "python3", + "vpython3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "recurse", diff --git a/recipes/recipe_modules/gclient/tests/diff_deps.expected/no change, exception.json b/recipes/recipe_modules/gclient/tests/diff_deps.expected/no change, exception.json index e70c9f0fe..719cc2fc7 100644 --- a/recipes/recipe_modules/gclient/tests/diff_deps.expected/no change, exception.json +++ b/recipes/recipe_modules/gclient/tests/diff_deps.expected/no change, exception.json @@ -27,7 +27,7 @@ }, { "cmd": [ - "python3", + "vpython3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "recurse", diff --git a/recipes/recipe_modules/gclient/tests/diff_deps.expected/windows.json b/recipes/recipe_modules/gclient/tests/diff_deps.expected/windows.json index a4079ff53..66d4768f8 100644 --- a/recipes/recipe_modules/gclient/tests/diff_deps.expected/windows.json +++ b/recipes/recipe_modules/gclient/tests/diff_deps.expected/windows.json @@ -27,7 +27,7 @@ }, { "cmd": [ - "python3", + "vpython3", "-u", "RECIPE_REPO[depot_tools]\\gclient.py", "recurse",