Ensure gclient solutions are always managed.

scripts/slave/update_scripts.py

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import json
 import logging
 import os
+import re
 import subprocess
 import sys
 import tempfile
 
 
 # Install Infra build environment.
 BUILD_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(
                              os.path.abspath(__file__))))
 sys.path.insert(0, os.path.join(BUILD_ROOT, 'scripts'))
 
 from common import annotator
 from common import env
 
 
 LOGGER = logging.getLogger('update_scripts')
 
 
 def _run_command(cmd, **kwargs):
   LOGGER.debug('Executing command: %s', cmd)
   kwargs.setdefault('stderr', subprocess.STDOUT)
   proc = subprocess.Popen(cmd, **kwargs)
   stdout, _ = proc.communicate()
 
   LOGGER.debug('Process [%s] returned [%d] with output:\n%s',
                cmd, proc.returncode, stdout)
   return proc.returncode, stdout
 
 
+def ensure_managed(dot_gclient_filename):
+  """Rewrites a .gclient file to set "managed": True.
+
+  Returns:
+    True if the .gclient file was modified.
+  """
+
+  with open(dot_gclient_filename) as fh:
+    contents = fh.read()
+
+  new_contents = re.sub(r'("managed"\s*:\s*)False', r'\1True', contents)
+
+  if contents != new_contents:
+    with open(dot_gclient_filename, 'w') as fh:
+      fh.write(new_contents)
+    return True
+  return False
+
+
 def update_scripts():
   if os.environ.get('RUN_SLAVE_UPDATED_SCRIPTS'):
     os.environ.pop('RUN_SLAVE_UPDATED_SCRIPTS')
     return False
 
   stream = annotator.StructuredAnnotationStream()
 
   with stream.step('update_scripts') as s:
+    if ensure_managed(os.path.join(env.Build, os.pardir, '.gclient')):
+      s.step_text('Top-level gclient solution was unmanaged, '
+                  'changed to managed')
+
     gclient_name = 'gclient'
     if sys.platform.startswith('win'):
       gclient_name += '.bat'
     gclient_path = os.path.join(env.Build, os.pardir, 'depot_tools',
                                 gclient_name)
     gclient_cmd = [gclient_path, 'sync', '--force', '--verbose', '--jobs=2',
                    '--break_repo_locks']
     try:
       fd, output_json = tempfile.mkstemp()
       os.close(fd)
@@ skipping 39 matching lines @@
       s.step_text('Unable to get SCM data')
       s.step_exception()
 
     os.environ['RUN_SLAVE_UPDATED_SCRIPTS'] = '1'
 
     # After running update scripts, set PYTHONIOENCODING=UTF-8 for the real
     # annotated_run.
     os.environ['PYTHONIOENCODING'] = 'UTF-8'
 
     return True