Skip to content

Commit 0f544e1

Browse files
committed
improve logging for masked functions, formatting
Signed-off-by: Zen <[email protected]>
1 parent c48f03e commit 0f544e1

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/ugrd/initramfs_dict.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ def _process_imports(self, import_type: str, import_value: dict) -> None:
275275
import_masks = [import_masks] if isinstance(import_masks, str) else import_masks
276276
for mask in import_masks:
277277
if mask in function_names:
278-
self.logger.warning("[%s] Skipping import of masked function: %s" % (module_name, mask))
278+
self.logger.warning(f"[{c_(module_name, bright=True)}] Skipping import of masked function: {c_(mask, 'yellow')}")
279279
function_names.remove(mask)
280280
if import_type == "custom_init":
281281
self.logger.warning("Skipping custom init function: %s" % mask)

src/ugrd/initramfs_generator.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,9 @@ def build(self) -> None:
9090
self.config_dict.validate() # Validate the config after the build tasks have been run
9191

9292
if self.validate and not self.validated:
93-
raise ValidationError(f"Failed to validate config. Unprocessed values: {', '.join(list(self['_processing'].keys()))}")
93+
raise ValidationError(
94+
f"Failed to validate config. Unprocessed values: {', '.join(list(self['_processing'].keys()))}"
95+
)
9496

9597
self.generate_init()
9698
self.pack_build()
@@ -153,7 +155,7 @@ def run_hook(self, hook: str, *args, **kwargs) -> list[str]:
153155
for function in self["imports"].get(hook, []):
154156
if function.__name__ in self["masks"].get(hook, []):
155157
self.logger.warning(
156-
"[%s] Skipping masked function: %s" % (hook, c_(function.__name__, "yellow", bold=True))
158+
f"[{c_(hook, bright=True)}] Skipping masked function: {c_(function.__name__, 'yellow', bold=True)}"
157159
)
158160
continue
159161

0 commit comments

Comments
 (0)