From 699980c32efea0704fd16427f6e8e5a470de673c Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Mon, 9 Mar 2026 18:12:41 +0000 Subject: [PATCH] cmds.secrets.Cmd: Fix errors on Kali 2026.1 Fix errors dug up by testing on Kali Linux 2026.1: - Nested class Cmds.Attrs is constructed without scope - "replace" falls back to empty list, not empty dictionary Signed-off-by: Jan Lindemann --- src/python/jw/pkg/cmds/secrets/Cmd.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/python/jw/pkg/cmds/secrets/Cmd.py b/src/python/jw/pkg/cmds/secrets/Cmd.py index 2b17bcd2..e46865a9 100644 --- a/src/python/jw/pkg/cmds/secrets/Cmd.py +++ b/src/python/jw/pkg/cmds/secrets/Cmd.py @@ -49,7 +49,7 @@ class Cmd(Base): # export if not re.match(r"^\s*#\s*conf\s*:", first_line): return None - ret = Attrs() + ret = self.Attrs() ret.conf = first_line @@ -98,7 +98,7 @@ class Cmd(Base): # export src: str, dst: str, default_attrs: Attrs | None, - replace: dict[str, str] = [], + replace: dict[str, str] = {}, ) -> None: owner = "root" @@ -224,7 +224,7 @@ class Cmd(Base): # export if default_attrs is None: default_attrs = attrs secret = target + '.jw-secret' - replace = [] if not os.path.exists(secret) else self.__read_key_value_file(secret) + replace = {} if not os.path.exists(secret) else self.__read_key_value_file(secret) for ext in [ '.jw-secret-file', '.jw-tmpl' ]: src = target + ext if os.path.exists(src):