From 5a97c60256c14aa013cfe20f4a1c5c390d23a5eb Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 18 Sep 2019 20:59:14 +0200 Subject: [PATCH] aportgen: fix fork_alpine related error (!1815) Make sure, that "args.fork_alpine" is always present. Otherwise, pmbootstrap will fail if the aportgen code is called by anything but "pmbootstrap aportgen". For example, when the user is adding a new device during "pmbootstrap init". Fixes: 54e51759ad1c6032d94b6f4855664ed3803bd864 ("aportgen: add feature to fork upstream packages") --- pmb/config/__init__.py | 1 + test/test_aportgen_device_wizard.py | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pmb/config/__init__.py b/pmb/config/__init__.py index fd4ffeea..73cc2fe0 100644 --- a/pmb/config/__init__.py +++ b/pmb/config/__init__.py @@ -66,6 +66,7 @@ defaults = { "config": os.path.expanduser("~") + "/.config/pmbootstrap.cfg", "device": "samsung-i9100", "extra_packages": "none", + "fork_alpine": False, "hostname": "", # A higher value is typically desired, but this can lead to VERY long open # times on slower devices due to host systems being MUCH faster than the diff --git a/test/test_aportgen_device_wizard.py b/test/test_aportgen_device_wizard.py index 03125a30..1e0366a1 100644 --- a/test/test_aportgen_device_wizard.py +++ b/test/test_aportgen_device_wizard.py @@ -35,7 +35,6 @@ def args(tmpdir, request): sys.argv = ["pmbootstrap.py", "build", "-i", "device-testsuite-testdevice"] args = pmb.parse.arguments() args.log = args.work + "/log_testsuite.txt" - args.fork_alpine = False pmb.helpers.logging.init(args) request.addfinalizer(args.logfd.close)