commit 7f10df8b92280757b4790ef41829867c96d3d68b
author Brian Norris <briannorris@chromium.org> Tue Aug 22 13:38:54 2023 -0700
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Aug 24 21:36:14 2023 +0000
tree 85b76a82d01d4f29f805366ad259adb78730add9
parent 872684feb2ebd81d0d3de8e6eff4196016a2c4aa

lib: cros_sdk_lib: Plumb Chroot into ChrootCreator

ChrootCreator is doing some interesting path construction, which we'd
like to pass through chroot_lib and/or path_util. We can also simplify
its construction, because chroot_lib.Chroot carries all these details.

BUG=b:265885353, b:297068910
TEST=./run_tests

Change-Id: I9d65cd979f74db8eca4de32c4e7198d4cf730479
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/4803931
Tested-by: Brian Norris <briannorris@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Brian Norris <briannorris@chromium.org>

scripts/cros_sdk.py

diff --git a/scripts/cros_sdk.py b/scripts/cros_sdk.py
index 77e3a94..524e1a1 100644
--- a/scripts/cros_sdk.py
+++ b/scripts/cros_sdk.py
@@ -889,10 +889,8 @@
             else:
                 sdk_tarball = FetchRemoteTarballs(sdk_cache, urls)
                 cros_sdk_lib.CreateChroot(
-                    Path(chroot.path),
+                    chroot,
                     Path(sdk_tarball),
-                    options.out_dir,
-                    Path(chroot.cache_dir),
                     usepkg=not options.bootstrap and not options.nousepkg,
                     chroot_upgrade=options.chroot_upgrade,
                 )
@@ -905,7 +903,7 @@
         if options.enter:
             lock.read_lock()
             if not mounted:
-                cros_sdk_lib.MountChrootPaths(chroot.path, options.out_dir)
+                cros_sdk_lib.MountChrootPaths(chroot)
             ret = cros_sdk_lib.EnterChroot(
                 chroot,
                 chrome_root_mount=options.chrome_root_mount,