commit 219566206502abfeb5e4408f6b8b15b39f4d637f
author Mike Frysinger <vapier@chromium.org> Tue Jan 31 02:44:49 2023 -0500
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Feb 07 07:45:00 2023 +0000
tree 5a40a0cdbf052e9a8bb7a3439d600a98a8e6b31a
parent 335b0b9bc45bf1cdc3ccd95f0bd2e026e4bbc4af

scripts: cros_sdk: switch to chroot_lib.Chroot.get_enter_args

We have to extend the existing API a little to support the option
form shflags uses (underscores instead of dashes).

BUG=b:191307774
TEST=`cros_sdk` still works

Change-Id: If816b22c71e32f4ab452bd675450d9cf3125cb1b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/4213658
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

scripts/cros_sdk.py

diff --git a/scripts/cros_sdk.py b/scripts/cros_sdk.py
index 2445d52..8396137 100644
--- a/scripts/cros_sdk.py
+++ b/scripts/cros_sdk.py
@@ -208,27 +208,9 @@
     if st.f_flag & os.ST_NOSUID:
         cros_build_lib.Die("chroot cannot be in a nosuid mount")
 
-    cmd = ENTER_CHROOT + [
-        "--chroot",
-        chroot.path,
-        "--cache_dir",
-        chroot.cache_dir,
-    ]
-    if chroot.chrome_root:
-        cmd.extend(["--chrome_root", chroot.chrome_root])
+    cmd = ENTER_CHROOT + chroot.get_enter_args(for_shell=True)
     if chrome_root_mount:
         cmd.extend(["--chrome_root_mount", chrome_root_mount])
-    if chroot.goma:
-        cmd.extend(["--goma_dir", chroot.goma.linux_goma_dir])
-    if chroot.remoteexec:
-        cmd.extend(
-            [
-                "--reclient_dir",
-                chroot.remoteexec.reclient_dir,
-                "--reproxy_cfg_file",
-                chroot.remoteexec.reproxy_cfg_file,
-            ]
-        )
     if working_dir is not None:
         cmd.extend(["--working_dir", working_dir])