From d62391349141e8e0986fac1b239ecc9deca2f4b1 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Tue, 2 Jun 2020 09:52:54 +0200 Subject: [PATCH] pmbootstrap init: (build => additional) options (MR 1931) Rename "build options" to "additional options", so we can put non-build related options there too. --- pmb/config/init.py | 8 ++++---- test/test_questions.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pmb/config/init.py b/pmb/config/init.py index d12ce5eb..c4622d1f 100644 --- a/pmb/config/init.py +++ b/pmb/config/init.py @@ -334,9 +334,9 @@ def ask_for_device(args): return (device, device_exists, kernel, nonfree) -def ask_for_build_options(args, cfg): - # Allow to skip build options - logging.info("Build options: Parallel jobs: " + args.jobs + +def ask_for_additional_options(args, cfg): + # Allow to skip additional options + logging.info("Additional options: Parallel jobs: " + args.jobs + ", ccache per arch: " + args.ccache_size) if not pmb.helpers.cli.confirm(args, "Change them?", @@ -423,7 +423,7 @@ def frontend(args): ui = ask_for_ui(args, device) cfg["pmbootstrap"]["ui"] = ui cfg["pmbootstrap"]["ui_extras"] = str(ask_for_ui_extras(args, ui)) - ask_for_build_options(args, cfg) + ask_for_additional_options(args, cfg) # Extra packages to be installed to rootfs logging.info("Additional packages that will be installed to rootfs." diff --git a/test/test_questions.py b/test/test_questions.py index d446c4f7..a0998631 100644 --- a/test/test_questions.py +++ b/test/test_questions.py @@ -250,8 +250,8 @@ def test_questions_work_path(args, monkeypatch, tmpdir): assert func(args) == (work, False) -def test_questions_build_options(args, monkeypatch): - func = pmb.config.init.ask_for_build_options +def test_questions_additional_options(args, monkeypatch): + func = pmb.config.init.ask_for_additional_options cfg = {"pmbootstrap": {}} # Skip changing anything