diff options
author | Daniel Golle <daniel@makrotopia.org> | 2020-07-03 21:57:52 +0100 |
---|---|---|
committer | Daniel Golle <daniel@makrotopia.org> | 2020-07-03 22:09:24 +0100 |
commit | 3b0f698760ae3a62173a28f18e9e1e3adef9c492 (patch) | |
tree | ce4c20b76e7c1a1516325ed75189369c37a1f2eb /scripts/json_overview_image_info.py | |
parent | a175bc8f36a43a562e1d1c38f5ff02f4f338dd4d (diff) | |
download | openwrt-3b0f698760ae3a62173a28f18e9e1e3adef9c492.tar.gz openwrt-3b0f698760ae3a62173a28f18e9e1e3adef9c492.tar.bz2 openwrt-3b0f698760ae3a62173a28f18e9e1e3adef9c492.zip |
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>
Diffstat (limited to 'scripts/json_overview_image_info.py')
-rwxr-xr-x | scripts/json_overview_image_info.py | 34 |
1 files changed, 16 insertions, 18 deletions
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") |