ClearML/clearml-agent
1
0
Fork 0
mirror of https://github.com/clearml/clearml-agent synced 2025-06-26 18:16:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Argv stores env/cwd if passed in ctor

Browse Source
This commit is contained in:
clearml 2025-03-03 19:23:51 +02:00
parent 3b70e1c4a0
commit 1926673951
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clearml_agent/helper/process.py
View File

@ -233,6 +233,8 @@ class Argv(Executable):
""" """
self.argv = argv self.argv = argv
self._log = kwargs.pop("log", None) self._log = kwargs.pop("log", None)
self._env = kwargs.pop("env", None)
self._cwd = kwargs.pop("cwd", None)
self._display_argv = kwargs.pop("display_argv", argv) self._display_argv = kwargs.pop("display_argv", argv)
if not self._log: if not self._log:
self._log = logging.getLogger(__name__) self._log = logging.getLogger(__name__)
@ -248,6 +250,14 @@ class Argv(Executable):
def call_subprocess(self, func, censor_password=False, *args, **kwargs): def call_subprocess(self, func, censor_password=False, *args, **kwargs):
self._log.debug("running: %s: %s", func.__name__, list(self)) self._log.debug("running: %s: %s", func.__name__, list(self))
if self._env:
env = copy(self._env)
kwargs = copy(kwargs)
env.update(kwargs.get("env", {}))
kwargs["env"] = env
if self._cwd and not kwargs.get("cwd"):
kwargs["cwd"] = self._cwd
with self.normalize_exception(censor_password): with self.normalize_exception(censor_password):
return func(list(self), *args, **kwargs) return func(list(self), *args, **kwargs)