From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 22 Jan 2024 09:45:32 +0000 (+0100)
Subject: Drop unneeded inner function
X-Git-Tag: v21~98^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e8a658f5c3689e5c17e517c97b853c2bb45f5ab;p=thirdparty%2Fmkosi.git

Drop unneeded inner function

The result should be exactly the same.

One of the loops was using inverted logic (continue-if-not-else-yield instead
of yield-if), so invert that for consistency.
---

diff --git a/mkosi/kmod.py b/mkosi/kmod.py
index d9efef8ca..ee49c25d5 100644
--- a/mkosi/kmod.py
+++ b/mkosi/kmod.py
@@ -157,32 +157,27 @@ def gen_required_kernel_modules(
     names = [module_path_to_name(m) for m in modules]
     mods, firmware = resolve_module_dependencies(root, kver, names, sandbox=sandbox)
 
-    def files() -> Iterator[Path]:
-        yield modulesd.parent
-        yield modulesd
-        yield modulesd / "kernel"
+    yield modulesd.parent
+    yield modulesd
+    yield modulesd / "kernel"
 
-        for d in (modulesd, root / "usr/lib/firmware"):
-            for p in (root / d).rglob("*"):
-                if p.is_dir():
-                    yield p
-
-        for p in sorted(mods) + sorted(firmware):
-            yield p
+    for d in (modulesd, root / "usr/lib/firmware"):
+        for p in (root / d).rglob("*"):
+            if p.is_dir():
+                yield p
 
-        for p in (root / modulesd).iterdir():
-            if not p.name.startswith("modules"):
-                continue
+    for p in sorted(mods) + sorted(firmware):
+        yield p
 
+    for p in (root / modulesd).iterdir():
+        if p.name.startswith("modules"):
             yield p
 
-        if (root / modulesd / "vdso").exists():
-            yield modulesd / "vdso"
+    if (root / modulesd / "vdso").exists():
+        yield modulesd / "vdso"
 
-            for p in (root / modulesd / "vdso").iterdir():
-                yield p
-
-    return files()
+        for p in (root / modulesd / "vdso").iterdir():
+            yield p
 
 
 def process_kernel_modules(