commit bbb66d798031435a6e3bb7630b47e22d50a93f0a
author Joanna Wang <jojwang@chromium.org> Mon Aug 29 21:48:55 2022 +0000
committer LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Aug 29 21:48:55 2022 +0000
tree c217646d9c4522e1f7b49593da359835e07bcbfe
parent b7ec673cccc42bce346234209dfd194b7911e169

Add cog/ cwd.

Bug: 1354709, b/242209562
Change-Id: I4a53efa0e633979f5a38a5618553e0b8fc243cca
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3863963
Auto-Submit: Joanna Wang <jojwang@chromium.org>
Reviewed-by: Aravind Vasudevan <aravindvasudev@google.com>
Commit-Queue: Aravind Vasudevan <aravindvasudev@google.com>

gclient_scm.py

diff --git a/gclient_scm.py b/gclient_scm.py
index 0671982..498e1c9 100644
--- a/gclient_scm.py
+++ b/gclient_scm.py
@@ -214,7 +214,8 @@
   def _IsCog():
     """Returns true if the env is cog"""
     if not GitWrapper._is_env_cog:
-      GitWrapper._is_env_cog = os.getcwd().startswith('/google/src/cloud')
+      GitWrapper._is_env_cog = any(os.getcwd().startswith(x) for x in [
+          '/google/cog/cloud', '/google/src/cloud'])
 
     return GitWrapper._is_env_cog