Merge pull request #973 from vojtechtrefny/3.4-devel_fix-availability…

…-errors-log Improve error message printed for missing dependecies
storaged-project · Aug 16, 2021 · 620685c · 620685c
2 parents f461a3a + 310fe0e
commit 620685c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/blivet/deviceaction.py b/blivet/deviceaction.py
@@ -173,7 +173,7 @@ def __init__(self, device):
     def _check_device_dependencies(self):
         unavailable_dependencies = self.device.unavailable_dependencies
         if unavailable_dependencies:
-            dependencies_str = ", ".join(str(d) for d in unavailable_dependencies)
+            dependencies_str = ", ".join("%s:\n%s" % (str(d), ", ".join(d.availability_errors)) for d in unavailable_dependencies)
             raise DependencyError("device type %s requires unavailable_dependencies: %s" % (self.device.type, dependencies_str))
 
     def apply(self):

diff --git a/blivet/tasks/availability.py b/blivet/tasks/availability.py
@@ -224,7 +224,7 @@ def _check_technologies(self):
             try:
                 self._tech_info.check_fn(tech, mode)
             except GLib.GError as e:
-                errors.append(str(e))
+                errors.append("%s: %s" % (tech.value_name, e.message))
         return errors
 
     def availability_errors(self, resource):
@@ -242,7 +242,7 @@ def availability_errors(self, resource):
             tech_missing = self._check_technologies()
             if tech_missing:
                 return ["libblockdev plugin %s is loaded but some required "
-                        "technologies are not available:\n%s" % (self._tech_info.plugin_name, tech_missing)]
+                        "technologies are not available (%s)" % (self._tech_info.plugin_name, "; ".join(tech_missing))]
             else:
                 return []