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

chroot: replace arch.from_chroot_suffix() with chroot.arch (MR 2252)

Browse source 
Another usage of args dropped!

Although the device_arch variable thing is not very ideal...

Signed-off-by: Caleb Connolly <caleb@postmarketos.org>
This commit is contained in:
Caleb Connolly 2024-05-24 19:22:35 +02:00 • committed by Oliver Smith
parent 8526631589
commit fa804c9453
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
9 changed files with 29 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pmb/chroot/init.py
View file

@ -57,7 +57,7 @@ def mark_in_chroot(args: PmbArgs, chroot: Chroot=Chroot.native()):
def setup_qemu_emulation(args: PmbArgs, chroot: Chroot):
arch = pmb.parse.arch.from_chroot_suffix(args, chroot)
arch = chroot.arch
if not pmb.parse.arch.cpu_emulation_required(arch):
return
@ -123,7 +123,7 @@ def init(args: PmbArgs, chroot: Chroot=Chroot.native(), usr_merge=UsrMerge.AUTO,
:param postmarketos_mirror: add postmarketos mirror URLs
"""
# When already initialized: just prepare the chroot
arch = pmb.parse.arch.from_chroot_suffix(args, chroot)
arch = chroot.arch
already_setup = str(chroot) in pmb.helpers.other.cache["pmb.chroot.init"]
if already_setup: