Merge "check the fruinf again as the oem process may return None"

2026-05-16 19:34:21 +00:00 · 2021-09-01 12:20:42 +00:00
parent d6ff1644c7 f61ffcac04
commit 77e14bc6c4
1 changed files with 3 additions and 1 deletions
@@ -690,7 +690,9 @@ class Command(object):
            if fruinf is not None:
                fruinf = self._oem.process_fru(fruinf,
                                               self._sdr.fru[fruid].fru_name)
-            yield (self._sdr.fru[fruid].fru_name, fruinf)
+            # check the fruinf again as the oem process may return None
+            if fruinf:
+                yield (self._sdr.fru[fruid].fru_name, fruinf)
        for componentpair in self._oem.get_oem_inventory():
            yield componentpair