From 14e6f9f2f8899e072eccab23389c7c65eaf926ed Mon Sep 17 00:00:00 2001 From: Lunaixsky Date: Tue, 3 Jun 2025 13:16:42 +0100 Subject: [PATCH 1/1] fix dependency check logic cause config always disabled fix incorrect term type of "use_graphic_device" fix incorrect enablement checking in "dep" command output in shconfig --- lunaix-os/hal/LConfig | 4 ++-- lunaix-os/scripts/build-tools/lcfg2/nodes.py | 2 +- lunaix-os/scripts/build-tools/shared/shconfig/commands.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lunaix-os/hal/LConfig b/lunaix-os/hal/LConfig index 5b6a86f..ba3f400 100644 --- a/lunaix-os/hal/LConfig +++ b/lunaix-os/hal/LConfig @@ -31,8 +31,8 @@ def hal(): return 256 @"Graphic Devices" - def use_graphic_dev() -> int: + def use_graphic_dev() -> bool: """ Support of graphical devices and display protocol """ - return False \ No newline at end of file + return False diff --git a/lunaix-os/scripts/build-tools/lcfg2/nodes.py b/lunaix-os/scripts/build-tools/lcfg2/nodes.py index 3b42394..da46005 100644 --- a/lunaix-os/scripts/build-tools/lcfg2/nodes.py +++ b/lunaix-os/scripts/build-tools/lcfg2/nodes.py @@ -136,7 +136,7 @@ class ConfigNode: parent = NodeProperty.Parent[self] if isinstance(val, bool): - en = en and val + en = val if isinstance(parent, ConfigNode): en = en and parent.enabled() diff --git a/lunaix-os/scripts/build-tools/shared/shconfig/commands.py b/lunaix-os/scripts/build-tools/shared/shconfig/commands.py index c668564..9b1a38f 100644 --- a/lunaix-os/scripts/build-tools/shared/shconfig/commands.py +++ b/lunaix-os/scripts/build-tools/shared/shconfig/commands.py @@ -136,7 +136,7 @@ class Commands(CmdTable): indent = " "*inds dep: NodeDependency = NodeProperty.Dependency[node] - state = 'enabled' if NodeProperty.Value[node] else 'disabled' + state = 'enabled' if NodeProperty.Enabled[node] else 'disabled' print(f"{indent}* {node._name} (currently {state})") if dep is None: return @@ -212,4 +212,4 @@ class Commands(CmdTable): lines = self.__format_config_list(nodes) - pydoc.pager("\n".join(lines)) \ No newline at end of file + pydoc.pager("\n".join(lines)) -- 2.27.0