From 8bc5366e609cbe76f3125b7a7e536a831d327926 Mon Sep 17 00:00:00 2001 From: Caleb Connolly Date: Sun, 3 Oct 2021 17:27:42 +0100 Subject: [PATCH] parse: deviceinfo: arch is required (MR 2124) The deviceinfo_arch property is required but not checked, this leads to weird errors if not caught. --- pmb/parse/deviceinfo.py | 4 ++++ .../aports/device/testing/device-multiple-kernels/deviceinfo | 1 + 2 files changed, 5 insertions(+) diff --git a/pmb/parse/deviceinfo.py b/pmb/parse/deviceinfo.py index b23b32fa..8e17765b 100644 --- a/pmb/parse/deviceinfo.py +++ b/pmb/parse/deviceinfo.py @@ -58,6 +58,10 @@ def sanity_check(info, path): " postmarketOS are 'handset' (for phones) and 'tablet'.") raise RuntimeError(f"Please add 'deviceinfo_chassis' to: {path}") + # "arch" is required + if "arch" not in info or not info["arch"]: + raise RuntimeError(f"Please add 'deviceinfo_arch' to: {path}") + # "chassis" validation chassis_type = info["chassis"] if chassis_type not in chassis_types: diff --git a/test/testdata/deviceinfo/aports/device/testing/device-multiple-kernels/deviceinfo b/test/testdata/deviceinfo/aports/device/testing/device-multiple-kernels/deviceinfo index 95fd2f7d..77849522 100644 --- a/test/testdata/deviceinfo/aports/device/testing/device-multiple-kernels/deviceinfo +++ b/test/testdata/deviceinfo/aports/device/testing/device-multiple-kernels/deviceinfo @@ -1,5 +1,6 @@ deviceinfo_codename="multiple-kernels" deviceinfo_chassis="handset" +deviceinfo_arch="aarch64" deviceinfo_append_dtb="yes" deviceinfo_dtb_mainline="mainline-dtb" deviceinfo_dtb_mainline_modem="mainline-modem-dtb"