|
@@ -3993,17 +3993,7 @@ def CMDsync(parser, args):
|
|
if options.verbose:
|
|
if options.verbose:
|
|
client.PrintLocationAndContents()
|
|
client.PrintLocationAndContents()
|
|
|
|
|
|
- # TODO(b/349643421): remove this check when non-git-sources is fully enabled.
|
|
|
|
- def gn_exists():
|
|
|
|
- cwd = os.getcwd()
|
|
|
|
- split_cwd = cwd.split(
|
|
|
|
- '/'
|
|
|
|
- ) # ['/', 'google', 'cog', 'cloud', <user>, <workspace_name>, ...]
|
|
|
|
- gn_path = os.path.join('/google/cog/cloud', *split_cwd[4:6],
|
|
|
|
- 'src/buildtools/linux64/gn')
|
|
|
|
- return os.path.exists(gn_path)
|
|
|
|
-
|
|
|
|
- if gclient_utils.IsEnvCog() and gn_exists():
|
|
|
|
|
|
+ if gclient_utils.IsEnvCog():
|
|
ret = client.RunOnDeps('runhooks', args)
|
|
ret = client.RunOnDeps('runhooks', args)
|
|
else:
|
|
else:
|
|
ret = client.RunOnDeps('update', args)
|
|
ret = client.RunOnDeps('update', args)
|