From: Paul Spooren Date: Mon, 21 Jun 2021 06:23:45 +0000 (-1000) Subject: build,json: fix generation with empty profiles X-Git-Tag: v21.02.0-rc4~72 X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=2e157714a8d4a0e1dbd6351ca0a3fe2fce75b0eb;p=openwrt%2Fstaging%2Fhauke.git build,json: fix generation with empty profiles If the image generation doesn't add any profiles to the output the *profile merge* will fail. To avoid that set an empty profile as fallback. Signed-off-by: Paul Spooren (cherry picked from commit fd0d9909bf50f114d5e7f7cedf53e542de878a2c) --- diff --git a/scripts/json_overview_image_info.py b/scripts/json_overview_image_info.py index 45c05012b1..db47fd9e42 100755 --- a/scripts/json_overview_image_info.py +++ b/scripts/json_overview_image_info.py @@ -42,7 +42,7 @@ for json_file in work_dir.glob("*.json"): output["profiles"][device_id]["images"].extend(profile["images"]) # make image lists unique by name, keep last/latest -for device_id, profile in output["profiles"].items(): +for device_id, profile in output.get("profiles", {}).items(): profile["images"] = list({e["name"]: e for e in profile["images"]}.values())