From 03bebb9848358d54c4c84f6a2a7a25dedac8734a Mon Sep 17 00:00:00 2001 From: Micke Nordin Date: Tue, 9 Jan 2024 12:35:30 +0100 Subject: [PATCH] SCANNER: Add some error handling so we don't ouput an empty result --- scanner/scanner.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scanner/scanner.py b/scanner/scanner.py index 8499ee0..9badf38 100755 --- a/scanner/scanner.py +++ b/scanner/scanner.py @@ -143,10 +143,13 @@ if __name__ == "__main__": os_hash = get_os_hash(image) pkg_list = get_packages(image, os_hash) inspect_data = get_inspect_data(image) + if os_hash == {} and pkg_list[0]['package']['version'] == None and inspect_data == []: + continue result[image] = { "pkg_list": pkg_list } result[image]["inspect_data"] = inspect_data result[image]["os_hash"] = os_hash cleanup_image(image) cleanup_all() - print(json.dumps(result)) + if result != {}: + print(json.dumps(result))