pmb.core.chroot: make type a property (MR 2252)

Signed-off-by: Caleb Connolly <caleb@postmarketos.org>

pmb/build/autodetect.py

@@ -94,7 +94,7 @@ def crosscompile(args: PmbArgs, apkbuild, arch, suffix: Chroot):
         return None
     if not pmb.parse.arch.cpu_emulation_required(arch):
         return None
-    if suffix.type() == ChrootType.NATIVE:
+    if suffix.type == ChrootType.NATIVE:
         return "native"
     if "!pmb:crossdirect" in apkbuild["options"]:
         return None

pmb/chroot/init.py

@@ -167,7 +167,7 @@ def init(args: PmbArgs, chroot: Chroot=Chroot.native(), usr_merge=UsrMerge.AUTO,
                                      "add", "alpine-base"])
 
     # Building chroots: create "pmos" user, add symlinks to /home/pmos
-    if not chroot.type() == ChrootType.ROOTFS:
+    if not chroot.type == ChrootType.ROOTFS:
         pmb.chroot.root(args, ["adduser", "-D", "pmos", "-u",
                                pmb.config.chroot_uid_user],
                         chroot, auto_init=False)

pmb/helpers/frontend.py

@@ -161,7 +161,7 @@ def chroot(args: PmbArgs):
     # Suffix
     suffix = _parse_suffix(args)
     if (args.user and suffix != Chroot.native() and
-            not suffix.type() == ChrootType.BUILDROOT):
+            not suffix.type == ChrootType.BUILDROOT):
         raise RuntimeError("--user is only supported for native or"
                            " buildroot_* chroots.")
     if args.xauth and suffix != Chroot.native():

pmb/parse/arch.py

@@ -19,7 +19,7 @@ def from_chroot_suffix(args: PmbArgs, chroot: Chroot) -> str:
         return pmb.config.arch_native
     if chroot.name() == args.device:
         return args.deviceinfo["arch"]
-    if chroot.type() == ChrootType.BUILDROOT:
+    if chroot.type == ChrootType.BUILDROOT:
         return chroot.name()
 
     raise ValueError(f"Invalid chroot suffix: {chroot}"