fix bug with kmod metadata pulling

Signed-off-by: Zen <[email protected]>

Author: desultory

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ugrd"
-version = "1.3.7"
+version = "1.3.8"
 authors = [
   { name="Desultory", email="[email protected]" },
 ]

src/ugrd/kmod/kmod.py

@@ -1,5 +1,5 @@
 __author__ = 'desultory'
-__version__ = '2.2.1'
+__version__ = '2.2.2'
 
 from pathlib import Path
 from subprocess import run
@@ -160,9 +160,8 @@ def autodetect_modules(self) -> None:
     _autodetect_modules_lspci(self)
 
 
-@check_dict('kmod_init', not_empty=True, message="kmod_init is not set, skipping.", log_level=30)
-def process_module_metadata(self) -> None:
-    """ Adds kernel module metadata files to dependencies."""
+def get_kernel_metadata(self) -> None:
+    """ Gets metadata for all kernel modules. """
     if not self.get('kernel_version'):
         try:
             cmd = self._run(['uname', '-r'])
@@ -172,11 +171,14 @@ def process_module_metadata(self) -> None:
         self['kernel_version'] = cmd.stdout.decode('utf-8').strip()
         self.logger.info(f"Using detected kernel version: {self['kernel_version']}")
 
-    module_path = Path('/lib/modules/') / self['kernel_version']
+    if not (Path('/lib/modules') / self['kernel_version']).exists():
+        raise DependencyResolutionError(f"Kernel module directory does not exist for kernel: {self['kernel_version']}")
 
-    if not module_path.exists():
-        raise DependencyResolutionError("[%s] Kernel module directory does not exist for kernel version: %s" % (self['kernel_version'], module_path))
 
+@check_dict('kmod_init', not_empty=True, message="kmod_init is not set, skipping.", log_level=30)
+def process_module_metadata(self) -> None:
+    """ Adds kernel module metadata files to dependencies."""
+    module_path = Path('/lib/modules/') / self['kernel_version']
     for meta_file in MODULE_METADATA_FILES:
         meta_file_path = module_path / meta_file
 

src/ugrd/kmod/kmod.toml

@@ -18,7 +18,7 @@ _kmod_modinfo = "dict" # Used internally, caches modinfo output for kernel modul
 "ugrd.kmod.kmod" = [ "_process_kmod_init_multi", "_process_kmod_ignore_multi" ]
 
 [imports.build_pre]
-"ugrd.kmod.kmod" = [ "process_module_metadata", "autodetect_modules", "process_modules" ]
+"ugrd.kmod.kmod" = [ "get_kernel_metadata", "autodetect_modules", "process_modules", "process_module_metadata" ]
 
 [imports.init_pre]
 "ugrd.kmod.kmod" = [ "load_modules" ]