From 18d1dcee205e9453da086929147319af74e0165d Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Mon, 8 Jun 2020 17:37:31 +0200 Subject: [PATCH] image-info: extract package listing into function Move the logic that retrieves the installed packages via rpm into its own function. --- tools/image-info | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/image-info b/tools/image-info index 6296a6bf5..bd28aef14 100755 --- a/tools/image-info +++ b/tools/image-info @@ -164,6 +164,11 @@ def rpm_verify(tree): } +def rpm_packages(tree): + pkgs = subprocess_check_output(["rpm", "--root", tree, "-qa"], str.split) + return list(sorted(pkgs)) + + def read_services(tree, state): return subprocess_check_output(["systemctl", f"--root={tree}", "list-unit-files"], (lambda s: parse_unit_files(s, state))) @@ -190,7 +195,7 @@ def read_firewall_zone(tree): def append_filesystem(report, tree): if os.path.exists(f"{tree}/etc/os-release"): - report["packages"] = sorted(subprocess_check_output(["rpm", "--root", tree, "-qa"], str.split)) + report["packages"] = rpm_packages(tree) report["rpm-verify"] = rpm_verify(tree) with open(f"{tree}/etc/os-release") as f: