[context] Split "env" values and prefixes.

recipe_modules/step/api.py

 # Copyright 2013 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 import contextlib
 import copy
 import types
 
 from recipe_engine import recipe_api
 from recipe_engine.config_types import Path
@@ skipping 153 matching lines @@
     assert isinstance(cmd, (types.NoneType, list))
     if cmd is not None:
       cmd = list(wrapper) + cmd
       assert all(isinstance(x, (int, long, basestring, Path, Placeholder))
                  for x in cmd)
 
     cwd = self.m.context.cwd
     if cwd and cwd == self.m.path['start_dir']:
       cwd = None
 
-    env = self.m.context.env
-    if self._prefix_path:
-      ps = self.m.path.pathsep
-      prefix = ps.join(self._prefix_path)
-      suffix = env.get('PATH', '%(PATH)s')
-      env['PATH'] = '%s%s%s' % (prefix, ps, suffix)
+    with self.m.context(env_prefixes={'PATH': self._prefix_path}):
+      env_prefixes = self.m.context.env_prefixes
 
     if ok_ret in ('any', 'all'):
       ok_ret = range(-256, 256)
 
     return self.step_client.run_step(self.step_client.StepConfig(
         name=full_name,
         base_name=full_name or name,
         cmd=cmd,
         cwd=cwd,
-        env=env,
+        env=self.m.context.env,
+        env_prefixes=env_prefixes,

[iannucci, 2017/06/13 20:28:12]

tuple(env_prefixen, pathsep)

[dnj, 2017/06/13 21:46:26]

Done.

+        pathsep=self.m.path.pathsep,
         allow_subannotations=bool(allow_subannotations),
         trigger_specs=[self._make_trigger_spec(trig)
                        for trig in (trigger_specs or ())],
         timeout=timeout,
         infra_step=self.m.context.infra_step or bool(infra_step),
         stdout=stdout,
         stderr=stderr,
         stdin=stdin,
         ok_ret=ok_ret,
         step_test_data=step_test_data,
         nest_level=self.m.context.nest_level,
     ))
 
   def _make_trigger_spec(self, trig):
     buildbot_changes = trig.get('buildbot_changes')
     assert isinstance(buildbot_changes, (types.NoneType, list))
 
     critical = trig.get('critical')
     return self.step_client.TriggerSpec(
         bucket=trig.get('bucket'),
         builder_name=trig['builder_name'],
         properties=trig.get('properties'),
         buildbot_changes=buildbot_changes,
         tags=trig.get('tags'),
         critical=bool(critical) if critical is not None else (True),
     )