From bbb2d16956d49da8470f7505e2fa2ccad777533c Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Fri, 17 Apr 2026 14:10:29 +0200 Subject: [PATCH] lib.FileContext.put(): Simplify .put() has some commands to _run(), and it uses its own CallContext for them. Since that pattern only replicates what run() does anyway, we could just as well use run() itself with less code, so do that. Signed-off-by: Jan Lindemann --- src/python/jw/pkg/lib/ExecContext.py | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/src/python/jw/pkg/lib/ExecContext.py b/src/python/jw/pkg/lib/ExecContext.py index 5d9d487e..f1312dd1 100644 --- a/src/python/jw/pkg/lib/ExecContext.py +++ b/src/python/jw/pkg/lib/ExecContext.py @@ -296,23 +296,8 @@ class ExecContext(Base): from .util import pretty_cmd - async def __run(cmd: list[str], cmd_input: Input=InputMode.NonInteractive) -> Result: - with self.CallContext(self, title=title, cmd=cmd, cmd_input=cmd_input, wd=None, - log_prefix='|', throw=True, verbose=verbose) as cc: - try: - ret = await self._run( - cmd=cc.cmd, - wd=cc.wd, - verbose=cc.verbose, - cmd_input=cc.cmd_input, - env=None, - interactive=cc.interactive, - log_prefix=cc.log_prefix - ) - except Exception as e: - return cc.exception(ret, e) - cc.check_exit_code(ret) - return ret + async def __run(cmd: list[str], cmd_input: Input=InputMode.NonInteractive, **kwargs) -> Result: + return await self.run(cmd, cmd_input=cmd_input, **kwargs) ret = Result(None, None, 1) try: