cbuild: remove separate cli.call_chroot

Fold the functionality into cli.call, drop unnecessary things.

Author: q66

src/cbuild/apk/cli.py

@@ -1,4 +1,4 @@
-from cbuild.core import logger, paths, chroot, profile
+from cbuild.core import logger, paths, chroot as cbroot, profile
 
 from . import sign as asign
 
@@ -29,14 +29,14 @@ def collect_repos(mrepo, intree, arch, use_altrepo, use_stage, use_net):
         srepos = mrepo.rparent.source_repositories
 
     if not arch:
-        arch = chroot.host_cpu()
+        arch = cbroot.host_cpu()
 
     prof = profile.get_profile(arch)
     use_cache = False
 
     rrepos = set(prof.repos)
 
-    for r in chroot.get_confrepos():
+    for r in cbroot.get_confrepos():
         if not r.startswith("/"):
             # should be a remote repository, skip outright if we
             # know that remote repos will not be used during this run
@@ -81,7 +81,7 @@ def collect_repos(mrepo, intree, arch, use_altrepo, use_stage, use_net):
     # alt repository comes last in order to be lower priority
     # also, always ignore stage for altrepo, as it should be considered opaque
     if paths.alt_repository() and use_altrepo:
-        for r in chroot.get_confrepos():
+        for r in cbroot.get_confrepos():
             if not r.startswith("/"):
                 continue
             r = r.lstrip("/")
@@ -125,34 +125,50 @@ def call(
     use_stage=True,
     allow_network=True,
     return_repos=False,
+    chroot=False,
 ):
     if allow_network:
         allow_network = _use_net
     cmd = [
-        paths.apk(),
         subcmd,
         "--no-interactive",
-        "--root",
-        root if root else paths.bldroot(),
         "--repositories-file",
         "/dev/null",
     ]
+    if not chroot:
+        cmd += ["--root", root if root else paths.bldroot()]
     if arch:
         cmd += ["--arch", arch]
     if not allow_network:
         cmd += ["--no-network"]
     if allow_untrusted:
-        cmd.append("--allow-untrusted")
+        cmd += ["--allow-untrusted"]
     if subcmd in ["add", "del", "fix", "upgrade"]:
-        cmd.append("--clean-protected")
+        cmd += ["--clean-protected"]
 
     crepos = collect_repos(
-        mrepo, False, arch, use_altrepo, use_stage, allow_network
-    )
-
-    retv = subprocess.run(
-        cmd + crepos + args, cwd=cwd, env=env, capture_output=capture_output
+        mrepo, chroot, arch, use_altrepo, use_stage, allow_network
     )
+    cmd += crepos
+
+    if chroot:
+        retv = cbroot.enter(
+            "apk",
+            *cmd,
+            *args,
+            capture_output=capture_output,
+            fakeroot=True,
+            mount_binpkgs=True,
+            mount_cbuild_cache=subcmd
+            in ["add", "del", "fix", "update", "upgrade"],
+        )
+    else:
+        retv = subprocess.run(
+            [paths.apk(), *cmd, *args],
+            cwd=cwd,
+            env=env,
+            capture_output=capture_output,
+        )
     if return_repos:
         return retv, crepos
     return retv
@@ -177,55 +193,6 @@ def query(fields, args, mrepo, return_repos=False, **kwargs):
     return outv
 
 
-# should never be called during stage 0 builds, only with a real chroot
-def call_chroot(
-    subcmd,
-    args,
-    mrepo,
-    capture_output=False,
-    check=False,
-    arch=None,
-    allow_untrusted=False,
-    use_stage=True,
-    full_chroot=False,
-    allow_network=True,
-):
-    from cbuild.core import chroot
-
-    if allow_network:
-        allow_network = _use_net
-
-    mount_cache = subcmd in ["add", "del", "fix", "update", "upgrade"]
-
-    if full_chroot:
-        cmd = [subcmd]
-    else:
-        cmd = [subcmd, "--repositories-file", "/dev/null"]
-    cmd.append("--no-interactive")
-    if arch:
-        cmd += ["--arch", arch]
-    if not allow_network:
-        cmd += ["--no-network"]
-    if allow_untrusted:
-        cmd.append("--allow-untrusted")
-    if mount_cache and subcmd != "update":
-        cmd.append("--clean-protected")
-
-    if not full_chroot:
-        cmd += collect_repos(mrepo, True, arch, True, use_stage, allow_network)
-
-    return chroot.enter(
-        "apk",
-        *cmd,
-        *args,
-        capture_output=capture_output,
-        check=check,
-        fakeroot=True,
-        mount_binpkgs=True,
-        mount_cbuild_cache=mount_cache,
-    )
-
-
 def get_provider(pkgn, pkg=None):
     cpf = pkg.rparent.profile() if pkg else None
 
@@ -338,10 +305,8 @@ def summarize_repo(repopath, olist, quiet=False):
 
 
 def prune(repopath, arch=None, dry=False):
-    from cbuild.core import chroot
-
     if not arch:
-        arch = chroot.host_cpu()
+        arch = cbroot.host_cpu()
 
     repopath = repopath / arch
 

src/cbuild/core/chroot.py

@@ -270,8 +270,12 @@ def shell_update(rnet, dirty):
 
     with flock.lock(flock.apklock(hcpu)):
         if (
-            apki.call_chroot(
-                "update", [], None, full_chroot=True, allow_network=rnet
+            enter(
+                "apk",
+                "update",
+                fakeroot=True,
+                mount_binpkgs=True,
+                mount_cbuild_cache=True,
             ).returncode
             != 0
         ):
@@ -575,12 +579,13 @@ def cleanup_world(bootstrapping, prof=None, perform=True):
             outf.write(f"{ep}\n")
 
     # perform transaction
-    f_ret = apki.call_chroot(
+    f_ret = apki.call(
         "fix",
         [],
         template.get_cats(),
         capture_output=True,
         allow_untrusted=True,
+        chroot=True,
     )
 
     if f_ret.returncode != 0:
@@ -608,10 +613,11 @@ def update(pkg):
     _prepare_etc()
 
     with flock.lock(flock.apklock(host_cpu())):
-        apki.call_chroot("update", ["-q"], pkg, check=True, use_stage=True)
-        apki.call_chroot(
-            "upgrade", ["--available"], pkg, check=True, use_stage=True
-        )
+        fret = apki.call("update", ["-q"], pkg, use_stage=True)
+        if fret.returncode == 0:
+            fret = apki.call("upgrade", ["--available"], pkg, use_stage=True)
+        if fret.returncode != 0:
+            raise errors.CbuildException("failed to update bldroot")
 
     # this is bootstrap-update
     if isinstance(pkg, str):

src/cbuild/core/dependencies.py

@@ -171,7 +171,7 @@ def _install_from_repo(pkg, pkglist, cross=False):
             allow_untrusted=not signkey,
         )
     elif cross and pkg.profile().cross:
-        ret = apki.call_chroot(
+        ret = apki.call(
             "add",
             [
                 "--root",
@@ -183,6 +183,7 @@ def _install_from_repo(pkg, pkglist, cross=False):
             capture_output=True,
             arch=pkg.profile().arch,
             allow_untrusted=not signkey,
+            chroot=True,
         )
     else:
         # write world file and fix instead of adding to account for previous
@@ -193,12 +194,13 @@ def _install_from_repo(pkg, pkglist, cross=False):
             for pkgn in pkglist:
                 wf.write(f"{pkgn}\n")
         # and then perform the transaction
-        ret = apki.call_chroot(
+        ret = apki.call(
             "fix",
             [],
             pkg,
             capture_output=True,
             allow_untrusted=not signkey,
+            chroot=True,
         )
     if ret.returncode != 0:
         outl = ret.stderr.strip().decode()