janware/jw-pkg
Watch
1
Code Pull requests Activity Actions
jw-pkg/test/unit/python/jw/pkg/lib/Distro/Makefile

7 lines
111 B
Makefile
Raw Normal View History

lib.Distro: Fix os-release and cascade macros expand_macros() looks up each %{name} via getattr with '-' turned into '_', but macro_names advertises two names that don't resolve: 'os-release' has no corresponding attribute, and 'os-cascade' resolves to the list property os_cascade, which str.replace() rejects. Both macros are listed in the platform info help output, yet always fail when used in a format string. The space-joined cascade string is the cascade property, and 'cascade' is the macro name the make recipes and scripts already use, together with the --format default in cmds/platform/CmdInfo.py. Before the App.distro_* properties moved to Distro, the advertised macro names were derived from the distro_* attribute names, so the advertised macro was %{cascade}; the hand-written macro_names replaced it with the list attribute's name. - Add the missing os_release attribute as an alias of os_release_str - Advertise the 'cascade' macro in macro_names instead of 'os-cascade', leaving os_cascade as the purely programmatic list - Update the platform info help expected output accordingly - Add unit tests for the os-release field parsers, the derived properties, and the expansion of every advertised macro Signed-off-by: Jan Lindemann <jan@janware.com> Assisted-by: unsloth/Qwen3.8-27B-GGUF:Q4_K_M with pi.dev v0.85.1
2026-09-08 22:20:07 +02:00
TOPDIR = ../../../../../../..
include $(TOPDIR)/make/proj.mk
include $(JWBDIR)/make/py-run.mk
all:
test: run
Copy permalink