Make gclient_scm.py use cache_dir

git_cache.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 """A git command for managing a local cache of git repositories."""
 
 import errno
 import logging
 import optparse
@@ skipping 219 matching lines @@
   parser.add_option('--all', '-a', action='store_true',
                     help='Unlock all repository caches')
   options, args = parser.parse_args(args)
   if len(args) > 1 or (len(args) == 0 and not options.all):
     parser.error('git cache unlock takes exactly one repo url, or --all')
 
   if not options.all:
     url = args[0]
     repo_dirs = [os.path.join(options.cache_dir, UrlToCacheDir(url))]
   else:
-    repo_dirs = [path for path in os.listdir(options.cache_dir)
-                 if os.path.isdir(path)]
+    repo_dirs = [os.path.join(options.cache_dir, path)
+                 for path in os.listdir(options.cache_dir)
+                 if os.path.isdir(os.path.join(options.cache_dir, path))]
   lockfiles = [repo_dir + '.lock' for repo_dir in repo_dirs
                if os.path.exists(repo_dir + '.lock')]
 
   if not options.force:
     parser.error('git cache unlock requires -f|--force to do anything. '
                  'Refusing to unlock the following repo caches: '
                  ', '.join(lockfiles))
 
   unlocked = []
   untouched = []
   for repo_dir in repo_dirs:
     lf = Lockfile(repo_dir)
     if lf.break_lock():
+      config_lock = os.path.join(repo_dir, 'config.lock')
+      if os.path.exists(config_lock):
+        os.remove(config_lock)
       unlocked.append(repo_dir)
     else:
       untouched.append(repo_dir)
 
   if unlocked:
     logging.info('Broke locks on these caches: %s' % unlocked)
   if untouched:
     logging.debug('Did not touch these caches: %s' % untouched)
 
 
@@ skipping 29 matching lines @@
     return options, args
 
 
 def main(argv):
   dispatcher = subcommand.CommandDispatcher(__name__)
   return dispatcher.execute(OptionParser(), argv)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))