Commit 1132f5f8 authored by szager@chromium.org's avatar szager@chromium.org

Add thread locking around GetCachePath().

BUG=406662
R=cmp@chromium.org, agable@chromium.org

Review URL: https://codereview.chromium.org/469073004

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@291569 0039d316-1c4b-4281-b951-d872f2087c98
parent 7b8b6dee
......@@ -12,6 +12,7 @@ import optparse
import os
import re
import tempfile
import threading
import time
import shutil
import subprocess
......@@ -144,6 +145,7 @@ class Mirror(object):
gsutil_exe = os.path.join(
os.path.dirname(os.path.abspath(__file__)),
'third_party', 'gsutil', 'gsutil')
cachepath_lock = threading.Lock()
def __init__(self, url, refs=None, print_func=None):
self.url = url
......@@ -202,6 +204,7 @@ class Mirror(object):
@classmethod
def GetCachePath(cls):
cls.cachepath_lock.acquire()
if not hasattr(cls, 'cachepath'):
try:
cachepath = subprocess.check_output(
......@@ -209,8 +212,10 @@ class Mirror(object):
except subprocess.CalledProcessError:
cachepath = None
if not cachepath:
cls.cachepath_lock.release()
raise RuntimeError('No global cache.cachepath git configuration found.')
setattr(cls, 'cachepath', cachepath)
cls.cachepath_lock.release()
return getattr(cls, 'cachepath')
def RunGit(self, cmd, **kwargs):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment