Make gclient_scm.py use cache_dir

git_cache.py

Index: git_cache.py
diff --git a/git_cache.py b/git_cache.py
index 77463a6013780b98e6e63b91bb082a1b6947a7a3..2df8c3c08877a51fbddd09cea02a8ab230742802 100755
--- a/git_cache.py
+++ b/git_cache.py
@@ -237,8 +237,9 @@ def CMDunlock(parser, args):
     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')]
 
@@ -252,6 +253,9 @@ def CMDunlock(parser, args):
   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)