plugins: initrd: error out with message if stage contains more than o…

…ne kernel build Signed-off-by: Ondrej Kubik <[email protected]>
canonical · Nov 28, 2024 · 9437485 · 9437485
1 parent 39c5567
commit 9437485
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 4 deletions.
diff --git a/snapcraft_legacy/plugins/v2/_initrd_build.py b/snapcraft_legacy/plugins/v2/_initrd_build.py
@@ -687,8 +687,17 @@ def get_build_commands(
 def _parse_kernel_release_cmd() -> List[str]:
     """Set kernel release from module/<release> directory name."""
     return [
-        'echo "Parsing kernel release..."',
-        'KERNEL_RELEASE=$(ls "${CRAFT_STAGE}/modules")',
+        textwrap.dedent(
+            """
+            echo "Parsing kernel release..."
+            KERNEL_RELEASE=$(ls "${CRAFT_STAGE}/modules")
+            space_regex="[[:space:]]+"
+            if [[ ${KERNEL_RELEASE} =~ ${space_regex} ]]; then
+                echo "ERROR: ${CRAFT_STAGE}/modules contains more than one kernel version, clean up your build environment!"
+                exit 1
+            fi
+            """
+        )
     ]
 
 

diff --git a/tests/legacy/unit/plugins/v2/test_initrd.py b/tests/legacy/unit/plugins/v2/test_initrd.py
@@ -769,7 +769,17 @@ def _is_sub_array(array, sub_array):
 ]
 
 _parse_kernel_release_cmd = [
-    'KERNEL_RELEASE=$(ls "${CRAFT_STAGE}/modules")',
+    textwrap.dedent(
+        """
+        echo "Parsing kernel release..."
+        KERNEL_RELEASE=$(ls "${CRAFT_STAGE}/modules")
+        space_regex="[[:space:]]+"
+        if [[ ${KERNEL_RELEASE} =~ ${space_regex} ]]; then
+            echo "ERROR: ${CRAFT_STAGE}/modules contains more than one kernel version, clean up your build environment!"
+            exit 1
+        fi
+        """
+    )
 ]
 
 _install_initrd_modules_cmd = [

diff --git a/tests/unit/parts/plugins/test_initrd.py b/tests/unit/parts/plugins/test_initrd.py
@@ -888,7 +888,17 @@ def _is_sub_array(array, sub_array):
 ]
 
 _parse_kernel_release_cmd = [
-    'KERNEL_RELEASE=$(ls "${CRAFT_STAGE}/modules")',
+    textwrap.dedent(
+        """
+        echo "Parsing kernel release..."
+        KERNEL_RELEASE=$(ls "${CRAFT_STAGE}/modules")
+        space_regex="[[:space:]]+"
+        if [[ ${KERNEL_RELEASE} =~ ${space_regex} ]]; then
+            echo "ERROR: ${CRAFT_STAGE}/modules contains more than one kernel version, clean up your build environment!"
+            exit 1
+        fi
+        """
+    )
 ]
 
 _install_initrd_modules_cmd = [