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

pmbootstrap init: (build => additional) options (MR 1931) 

Rename "build options" to "additional options", so we can put non-build
related options there too.
This commit is contained in:
Oliver Smith 2020-06-02 09:52:54 +02:00
parent 0ff9c5d471
commit d623913491
No known key found for this signature in database
GPG Key ID: 5AE7F5513E0885CB
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pmb/config/init.py
View File

@ -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."

4
test/test_questions.py
View File

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