diff --git a/recipe_modules/bot_update/api.py b/recipe_modules/bot_update/api.py index f1f31bd1c..540ba8db3 100644 --- a/recipe_modules/bot_update/api.py +++ b/recipe_modules/bot_update/api.py @@ -34,7 +34,7 @@ class BotUpdateApi(recipe_api.RecipeApi): kwargs.setdefault('env', {}) kwargs['env'].setdefault('PATH', '%(PATH)s') kwargs['env']['PATH'] = self.m.path.pathsep.join([ - kwargs['env']['PATH'], str(self._module.PACKAGE_REPO_ROOT)]) + str(self._module.PACKAGE_REPO_ROOT), kwargs['env']['PATH']]) return self.m.python(name, bot_update_path, cmd, **kwargs) @property diff --git a/recipe_modules/bot_update/example.expected/basic.json b/recipe_modules/bot_update/example.expected/basic.json index 75efd0a84..820c2194e 100644 --- a/recipe_modules/bot_update/example.expected/basic.json +++ b/recipe_modules/bot_update/example.expected/basic.json @@ -18,7 +18,7 @@ "src@abc" ], "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, "name": "bot_update (without patch)", "~followup_annotations": [ diff --git a/recipe_modules/bot_update/example.expected/basic_output_manifest.json b/recipe_modules/bot_update/example.expected/basic_output_manifest.json index f333cf606..faf07c98b 100644 --- a/recipe_modules/bot_update/example.expected/basic_output_manifest.json +++ b/recipe_modules/bot_update/example.expected/basic_output_manifest.json @@ -19,7 +19,7 @@ "--output_manifest" ], "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, "name": "bot_update", "~followup_annotations": [ diff --git a/recipe_modules/bot_update/example.expected/basic_with_branch_heads.json b/recipe_modules/bot_update/example.expected/basic_with_branch_heads.json index b3c34c0ab..b3384d89e 100644 --- a/recipe_modules/bot_update/example.expected/basic_with_branch_heads.json +++ b/recipe_modules/bot_update/example.expected/basic_with_branch_heads.json @@ -19,7 +19,7 @@ "--with_branch_heads" ], "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, "name": "bot_update - with branch heads", "~followup_annotations": [ diff --git a/recipe_modules/bot_update/example.expected/clobber.json b/recipe_modules/bot_update/example.expected/clobber.json index 0f511633e..870062e23 100644 --- a/recipe_modules/bot_update/example.expected/clobber.json +++ b/recipe_modules/bot_update/example.expected/clobber.json @@ -19,7 +19,7 @@ "--clobber" ], "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, "name": "bot_update", "~followup_annotations": [ diff --git a/recipe_modules/bot_update/example.expected/gerrit_no_rebase_patch_ref.json b/recipe_modules/bot_update/example.expected/gerrit_no_rebase_patch_ref.json index cbaab11c6..4f27a4e40 100644 --- a/recipe_modules/bot_update/example.expected/gerrit_no_rebase_patch_ref.json +++ b/recipe_modules/bot_update/example.expected/gerrit_no_rebase_patch_ref.json @@ -19,7 +19,7 @@ "--gerrit_no_rebase_patch_ref" ], "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, "name": "bot_update", "~followup_annotations": [ diff --git a/recipe_modules/bot_update/example.expected/gerrit_no_reset.json b/recipe_modules/bot_update/example.expected/gerrit_no_reset.json index 118998391..820e50f37 100644 --- a/recipe_modules/bot_update/example.expected/gerrit_no_reset.json +++ b/recipe_modules/bot_update/example.expected/gerrit_no_reset.json @@ -19,7 +19,7 @@ "--gerrit_no_reset" ], "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, "name": "bot_update", "~followup_annotations": [ diff --git a/recipe_modules/bot_update/example.expected/no_shallow.json b/recipe_modules/bot_update/example.expected/no_shallow.json index 0c5ffe3e0..94fbe4266 100644 --- a/recipe_modules/bot_update/example.expected/no_shallow.json +++ b/recipe_modules/bot_update/example.expected/no_shallow.json @@ -19,7 +19,7 @@ "--no_shallow" ], "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, "name": "bot_update", "~followup_annotations": [ diff --git a/recipe_modules/bot_update/example.expected/reset_root_solution_revision.json b/recipe_modules/bot_update/example.expected/reset_root_solution_revision.json index 0d9fb489b..aa7bf1d14 100644 --- a/recipe_modules/bot_update/example.expected/reset_root_solution_revision.json +++ b/recipe_modules/bot_update/example.expected/reset_root_solution_revision.json @@ -18,7 +18,7 @@ "src@revision" ], "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, "name": "bot_update", "~followup_annotations": [ diff --git a/recipe_modules/bot_update/example.expected/trychange.json b/recipe_modules/bot_update/example.expected/trychange.json index 2a6e0ac39..9887237fa 100644 --- a/recipe_modules/bot_update/example.expected/trychange.json +++ b/recipe_modules/bot_update/example.expected/trychange.json @@ -20,7 +20,7 @@ "+refs/change/1/2/333" ], "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, "name": "bot_update", "~followup_annotations": [ diff --git a/recipe_modules/bot_update/example.expected/trychange_oauth2.json b/recipe_modules/bot_update/example.expected/trychange_oauth2.json index b0917d4bf..f24f886c0 100644 --- a/recipe_modules/bot_update/example.expected/trychange_oauth2.json +++ b/recipe_modules/bot_update/example.expected/trychange_oauth2.json @@ -22,7 +22,7 @@ "src@HEAD" ], "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, "name": "bot_update", "~followup_annotations": [ diff --git a/recipe_modules/bot_update/example.expected/tryjob.json b/recipe_modules/bot_update/example.expected/tryjob.json index ee56bb199..da7f5c232 100644 --- a/recipe_modules/bot_update/example.expected/tryjob.json +++ b/recipe_modules/bot_update/example.expected/tryjob.json @@ -24,7 +24,7 @@ "src@HEAD" ], "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, "name": "bot_update", "~followup_annotations": [ diff --git a/recipe_modules/bot_update/example.expected/tryjob_fail.json b/recipe_modules/bot_update/example.expected/tryjob_fail.json index 7f720ab35..0fee00658 100644 --- a/recipe_modules/bot_update/example.expected/tryjob_fail.json +++ b/recipe_modules/bot_update/example.expected/tryjob_fail.json @@ -24,7 +24,7 @@ "src@HEAD" ], "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, "name": "bot_update", "~followup_annotations": [ diff --git a/recipe_modules/bot_update/example.expected/tryjob_fail_patch.json b/recipe_modules/bot_update/example.expected/tryjob_fail_patch.json index ed3caebc5..fab3f12b2 100644 --- a/recipe_modules/bot_update/example.expected/tryjob_fail_patch.json +++ b/recipe_modules/bot_update/example.expected/tryjob_fail_patch.json @@ -24,7 +24,7 @@ "src@HEAD" ], "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, "name": "bot_update", "~followup_annotations": [ diff --git a/recipe_modules/bot_update/example.expected/tryjob_fail_patch_download.json b/recipe_modules/bot_update/example.expected/tryjob_fail_patch_download.json index 4328d4b90..7558d3ddb 100644 --- a/recipe_modules/bot_update/example.expected/tryjob_fail_patch_download.json +++ b/recipe_modules/bot_update/example.expected/tryjob_fail_patch_download.json @@ -24,7 +24,7 @@ "src@HEAD" ], "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, "name": "bot_update", "~followup_annotations": [ diff --git a/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle.json b/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle.json index 4d1d7b89a..e3c452595 100644 --- a/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle.json +++ b/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle.json @@ -24,7 +24,7 @@ "src/third_party/angle@HEAD" ], "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, "name": "bot_update", "~followup_annotations": [ diff --git a/recipe_modules/bot_update/example.expected/tryjob_v8.json b/recipe_modules/bot_update/example.expected/tryjob_v8.json index 105604bc7..ed76b2ada 100644 --- a/recipe_modules/bot_update/example.expected/tryjob_v8.json +++ b/recipe_modules/bot_update/example.expected/tryjob_v8.json @@ -26,7 +26,7 @@ "src/v8@abc" ], "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, "name": "bot_update", "~followup_annotations": [ diff --git a/recipe_modules/bot_update/example.expected/tryjob_v8_head_by_default.json b/recipe_modules/bot_update/example.expected/tryjob_v8_head_by_default.json index ed4352e21..47e9c9014 100644 --- a/recipe_modules/bot_update/example.expected/tryjob_v8_head_by_default.json +++ b/recipe_modules/bot_update/example.expected/tryjob_v8_head_by_default.json @@ -26,7 +26,7 @@ "src/v8@HEAD" ], "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, "name": "bot_update", "~followup_annotations": [