synit
/
pmbootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Minecrell 2021-10-22 12:44:42 +02:00 committed by Oliver Smith
parent 9d724d5d3d
commit 7246c32539
No known key found for this signature in database
GPG Key ID: 5AE7F5513E0885CB
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pmb/install/_install.py
View File

@ -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: