commit 875b30eb4cdff01eed1030b46c64e39a30078826
author Alex Klein <saklein@chromium.org> Tue Jan 05 14:56:33 2021 -0700
committer Commit Bot <commit-bot@chromium.org> Wed Jan 06 11:56:27 2021 +0000
tree d9147e34b208497c31e5aed79680d72c81562cc8
parent 24fc60c46d1176eb5d5baf2f8b6f5d7afe2b478e

cros-sdk: Use os.ST_NOSUID constant.

It had a magic number because the constant wasn't added until
python3.2. Now that we're on 3.6, switch to the constant.

BUG=None
TEST=CQ

Change-Id: I0daa53a063b2ca0eda18aa6f8541c7f0bc06ac82
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2611748
Tested-by: Alex Klein <saklein@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>

scripts/cros_sdk.py

diff --git a/scripts/cros_sdk.py b/scripts/cros_sdk.py
index 11cfb21..de1ba1c 100644
--- a/scripts/cros_sdk.py
+++ b/scripts/cros_sdk.py
@@ -227,8 +227,7 @@
                 goma_dir, goma_client_json, working_dir, additional_args):
   """Enters an existing SDK chroot"""
   st = os.statvfs(os.path.join(chroot_path, 'usr', 'bin', 'sudo'))
-  # The os.ST_NOSUID constant wasn't added until python-3.2.
-  if st.f_flag & 0x2:
+  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', cache_dir]