From: Daniel Golle <daniel@makrotopia.org>
Date: Fri, 3 Jul 2020 20:57:52 +0000 (+0100)
Subject: build,json: fix build failure in case no data is found
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3b0f698760ae3a62173a28f18e9e1e3adef9c492;p=openwrt%2Fstaging%2Fdangole.git

build,json: fix build failure in case no data is found

Only collect arch_packages if actually generating any output.

Fixes: commit f09b9319 ("build,json: store arch_packages in profiles.json"(
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Signed-off-by: Paul Spooren <mail@aparcar.org>
---

diff --git a/scripts/json_overview_image_info.py b/scripts/json_overview_image_info.py
index 20b14f236b..8f3525f890 100755
--- a/scripts/json_overview_image_info.py
+++ b/scripts/json_overview_image_info.py
@@ -32,25 +32,23 @@ for json_file in work_dir.glob("*.json"):
                 image_info["profiles"][device_id]["images"][0]
             )
 
-
-default_packages, output["arch_packages"] = run(
-    [
-        "make",
-        "--no-print-directory",
-        "-C",
-        f"target/linux/{output['target'].split('/')[0]}",
-        "val.DEFAULT_PACKAGES",
-        "val.ARCH_PACKAGES",
-    ],
-    capture_output=True,
-    check=True,
-    env=environ.copy().update({"TOPDIR": Path().cwd()}),
-    text=True,
-).stdout.splitlines()
-
-output["default_packages"] = default_packages.split()
-
 if output:
+    default_packages, output["arch_packages"] = run(
+        [
+            "make",
+            "--no-print-directory",
+            "-C",
+            f"target/linux/{output['target'].split('/')[0]}",
+            "val.DEFAULT_PACKAGES",
+            "val.ARCH_PACKAGES",
+        ],
+        capture_output=True,
+        check=True,
+        env=environ.copy().update({"TOPDIR": Path().cwd()}),
+        text=True,
+    ).stdout.splitlines()
+
+    output["default_packages"] = default_packages.split()
     output_path.write_text(json.dumps(output, sort_keys=True, separators=(",", ":")))
 else:
     print("JSON info file script could not find any JSON files for target")