Merge pull request #330 from desultory/dev

black format, improve logging

Author: desultory

src/ugrd/generator_helpers.py

@@ -9,9 +9,7 @@
 
 from .exceptions import ValidationError
 
-__version__ = "1.7.0"
-__author__ = "desultory"
-
+__version__ = "1.7.1"
 
 _RANDOM_BUILD_ID = str(uuid4())
 
@@ -240,7 +238,7 @@ def print_err(ret) -> None:
             if not fail_silent:
                 print_err(cmd)  # Print the full error output if not failing silently
             if fail_hard:  # Fail hard means raise an exception
-                raise RuntimeError("Failed to run command: %s" % " ".join(cmd.args))
+                raise RuntimeError("Failed to run command: %s" % c_(" ".join(cmd.args), "red", bright=True))
 
         return cmd
 

src/ugrd/initramfs_dict.py

@@ -39,7 +39,7 @@ class InitramfsConfigDict(UserDict):
         "validated": bool,  # A flag to indicate if the config has been validated, mostly used for log levels
         "custom_parameters": dict,  # Custom parameters loaded from imports
         "custom_processing": dict,  # Custom processing functions which will be run to validate and process parameters
-        "_processing": dict, # A dict of queues containing parameters which have been set before the type was known
+        "_processing": dict,  # A dict of queues containing parameters which have been set before the type was known
         "test_copy_config": NoDupFlatList,  # A list of config values which are copied into test images, from the parent
     }
 
@@ -275,7 +275,9 @@ def _process_imports(self, import_type: str, import_value: dict) -> None:
                 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(f"[{c_(module_name, bright=True)}] Skipping import of masked function: {c_(mask, 'yellow')}")
+                        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)