Administration/pmbootstrap-meow
2
0
Fork 0
forked from Mirror/pmbootstrap
Code Pull requests Activity Actions

aportgen: fix fork_alpine related error (!1815)

Browse source 
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: 54e51759ad ("aportgen: add feature to fork upstream packages")
This commit is contained in:
Oliver Smith 2019-09-18 20:59:14 +02:00
parent f853c0da20
commit 5a97c60256
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
2 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
pmb/config/__init__.py
View file

@ -66,6 +66,7 @@ defaults = {
"config": os.path.expanduser("~") + "/.config/pmbootstrap.cfg", "config": os.path.expanduser("~") + "/.config/pmbootstrap.cfg",
"device": "samsung-i9100", "device": "samsung-i9100",
"extra_packages": "none", "extra_packages": "none",
"fork_alpine": False,
"hostname": "", "hostname": "",
# A higher value is typically desired, but this can lead to VERY long open # 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 # times on slower devices due to host systems being MUCH faster than the

1
test/test_aportgen_device_wizard.py
View file

@ -35,7 +35,6 @@ def args(tmpdir, request):
sys.argv = ["pmbootstrap.py", "build", "-i", "device-testsuite-testdevice"] sys.argv = ["pmbootstrap.py", "build", "-i", "device-testsuite-testdevice"]
args = pmb.parse.arguments() args = pmb.parse.arguments()
args.log = args.work + "/log_testsuite.txt" args.log = args.work + "/log_testsuite.txt"
args.fork_alpine = False
pmb.helpers.logging.init(args) pmb.helpers.logging.init(args)
request.addfinalizer(args.logfd.close) request.addfinalizer(args.logfd.close)