diff mbox series

[4/5] devtool: standard: simplify get_staging_kver

Message ID 20250129181456.1826467-4-chris.laplante@agilent.com
State Accepted, archived
Commit 80285b0f9b716ebad87a2feb08f12f87d70c27e3
Headers show
Series [1/5] devtool: standard: cleanup imports; stop relying on transitive bb imports | expand

Commit Message

chris.laplante@agilent.com Jan. 29, 2025, 6:14 p.m. UTC 
From: Chris Laplante <chris.laplante@agilent.com>

The goal is to make this more Pythonic, as it was a little cryptic the
first time I looked at it.

Signed-off-by: Chris Laplante <chris.laplante@agilent.com>
---
 scripts/lib/devtool/standard.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
diff mbox series

Patch

diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 20c94616b2..0cdb9c6cfb 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -726,15 +726,13 @@  def _check_preserve(config, recipename):
 
 def get_staging_kver(srcdir):
     # Kernel version from work-shared
-    kerver = []
-    staging_kerVer=""
-    if os.path.exists(srcdir) and os.listdir(srcdir):
+    import itertools
+    try:
         with open(os.path.join(srcdir, "Makefile")) as f:
-            version = [next(f) for x in range(5)][1:4]
-            for word in version:
-                kerver.append(word.split('= ')[1].split('\n')[0])
-            staging_kerVer = ".".join(kerver)
-    return staging_kerVer
+            # Take VERSION, PATCHLEVEL, SUBLEVEL from lines 1, 2, 3
+            return ".".join(line.rstrip().split('= ')[1] for line in itertools.islice(f, 1, 4))
+    except FileNotFoundError:
+        return ""
 
 def get_staging_kbranch(srcdir):
     import bb.process