Merge pull request #329 from desultory/dev

fix broken mask lookup, improve formatting

Author: desultory

src/ugrd/initramfs_dict.py

@@ -1,5 +1,5 @@
 __author__ = "desultory"
-__version__ = "2.4.0"
+__version__ = "2.4.1"
 
 from collections import UserDict
 from importlib import import_module
@@ -271,11 +271,11 @@ def _process_imports(self, import_type: str, import_value: dict) -> None:
                 self.logger.log(5, "Creating import type: %s" % import_type)
                 self["imports"][import_type] = NoDupFlatList(_log_bump=10, logger=self.logger)
 
-            if import_masks := self.get("masks", {}).get(import_type, {}).get(module_name):
+            if import_masks := self.get("masks", {}).get(import_type, []):
                 import_masks = [import_masks] if isinstance(import_masks, str) else import_masks
                 for mask in import_masks:
                     if mask in function_names:
-                        self.logger.warning("[%s] Skipping import of masked function: %s" % (module_name, mask))
+                        self.logger.warning(f"[{c_(module_name, bright=True)}] Skipping import of masked function: {c_(mask, 'yellow')}")
                         function_names.remove(mask)
                         if import_type == "custom_init":
                             self.logger.warning("Skipping custom init function: %s" % mask)

src/ugrd/initramfs_generator.py

@@ -90,7 +90,9 @@ def build(self) -> None:
         self.config_dict.validate()  # Validate the config after the build tasks have been run
 
         if self.validate and not self.validated:
-            raise ValidationError(f"Failed to validate config. Unprocessed values: {', '.join(list(self['_processing'].keys()))}")
+            raise ValidationError(
+                f"Failed to validate config. Unprocessed values: {', '.join(list(self['_processing'].keys()))}"
+            )
 
         self.generate_init()
         self.pack_build()
@@ -153,7 +155,7 @@ def run_hook(self, hook: str, *args, **kwargs) -> list[str]:
         for function in self["imports"].get(hook, []):
             if function.__name__ in self["masks"].get(hook, []):
                 self.logger.warning(
-                    "[%s] Skipping masked function: %s" % (hook, c_(function.__name__, "yellow", bold=True))
+                    f"[{c_(hook, bright=True)}] Skipping masked function: {c_(function.__name__, 'yellow', bold=True)}"
                 )
                 continue