From 7246c32539cd5edeb3728ef3f0a276b62f8afc5a Mon Sep 17 00:00:00 2001 From: Minecrell Date: Fri, 22 Oct 2021 12:44:42 +0200 Subject: [PATCH] pmb.install: move install_recommends check into _install.py (MR 2132) The current install code looks a bit confusing, there is an existing if statement for the ui and ui-extras package but the recommended packages are already installed before with a check in a completely different file. Make this a bit more clear by moving this to the ui if statement instead. --- pmb/install/_install.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pmb/install/_install.py b/pmb/install/_install.py index f08c4216..0906fdd2 100644 --- a/pmb/install/_install.py +++ b/pmb/install/_install.py @@ -804,8 +804,7 @@ def create_device_rootfs(args, step, steps): install_packages = (pmb.config.install_device_packages + ["device-" + args.device] + get_kernel_package(args, args.device) + - get_nonfree_packages(args, args.device) + - pmb.install.ui.get_recommends(args)) + get_nonfree_packages(args, args.device)) if not args.install_base: install_packages = [p for p in install_packages if p != "postmarketos-base"] @@ -813,6 +812,8 @@ def create_device_rootfs(args, step, steps): install_packages += ["postmarketos-ui-" + args.ui] if args.ui_extras: install_packages += ["postmarketos-ui-" + args.ui + "-extras"] + if args.install_recommends: + install_packages += pmb.install.ui.get_recommends(args) if args.extra_packages.lower() != "none": install_packages += args.extra_packages.split(",") if args.add: