The toolchain_build git cache is now referenced as a git-alternate.

toolchain_build/command.py

 #!/usr/bin/python
 # Copyright (c) 2012 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Class capturing a command invocation as data."""
 
 import inspect
 import glob
 import hashlib
@@ skipping 356 matching lines @@
             (updated_push_url != tracked_push_url)):
           logging.warn('Your git repo is using an old mirror: %s', abs_dir)
           logging.warn('Updating git repo using known mirror:')
           logging.warn('  [FETCH] %s -> %s',
                        tracked_fetch_url, updated_fetch_url)
           logging.warn('  [PUSH] %s -> %s',
                        tracked_push_url, updated_push_url)
           pynacl.repo_tools.GitSetRemoteRepo(updated_fetch_url, abs_dir,
                                              push_url=updated_push_url)
 
-
   def populate_cache(subst, git_cache, url):
     if git_cache:
       abs_git_cache = subst.SubstituteAbsPaths(git_cache)
       if abs_git_cache:
         pynacl.repo_tools.PopulateGitCache(abs_git_cache, [url])
 
-  def validate(subst, url, directory, git_cache):
-    expected_url = url
-    if git_cache:
-      abs_git_cache = subst.SubstituteAbsPaths(git_cache)
-      if abs_git_cache:
-        expected_url = pynacl.repo_tools.GetGitCacheURL(abs_git_cache, url)
-
-    pynacl.repo_tools.ValidateGitRepo(expected_url,
+  def validate(subst, url, directory):
+    pynacl.repo_tools.ValidateGitRepo(url,
                                       subst.SubstituteAbsPaths(directory),
                                       clobber_mismatch=True)
 
   def sync(subst, url, dest, revision, reclone, clean, pathspec, git_cache,
            push_url):
     abs_dest = subst.SubstituteAbsPaths(dest)
     if git_cache:
       git_cache = subst.SubstituteAbsPaths(git_cache)
 
     try:
@@ skipping 24 matching lines @@
       return True
     return cmd_opts.IsBot()
 
   commands = []
   if git_cache:
     commands.append(Runnable(run_cond, populate_cache, git_cache, url))
 
   commands.extend([Runnable(run_cond, update_valid_mirrors, url, push_url,
                             destination, known_mirrors, push_mirrors),
                    Runnable(ClobberInvalidRepoCondition, validate, url,
-                            destination, git_cache),
+                            destination),
                    Runnable(run_cond, sync, url, destination, revision, reclone,
                             clean, pathspec, git_cache, push_url)])
   return commands
 
 
 def CleanGitWorkingDir(directory, path, run_cond=None):
   """Clean a path in a git checkout, if the checkout directory exists."""
   def clean(subst, directory, path):
     directory = subst.SubstituteAbsPaths(directory)
     if os.path.exists(directory) and len(os.listdir(directory)) > 0:
@@ skipping 85 matching lines @@
 # It describes how to unpack and apply patches to produce the source
 # tree of the %(name)s component of a toolchain targetting Native Client.
 
 # Source: %(upstream-name)s.tar
 """
               % info)
       for patch in patch_files:
         f.write('\n# %s\n%s\n' % patch)
 
   return Runnable(run_cond, generatePatches, git_dir, info)