Commit c3e09d23 authored by borenet@google.com's avatar borenet@google.com

Fix for GitWrapper._Capture

BUG=361155

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@262977 0039d316-1c4b-4281-b951-d872f2087c98
parent 4039b318
......@@ -162,7 +162,7 @@ class SCMWrapper(object):
if os.path.exists(os.path.join(self.checkout_path, '.git')):
actual_remote_url = shlex.split(self._Capture(
['config', '--local', '--get-regexp', r'remote.*.url'],
self.checkout_path))[1]
cwd=self.checkout_path))[1]
# If a cache_dir is used, obtain the actual remote URL from the cache.
if getattr(self, 'cache_dir', None):
......@@ -948,7 +948,7 @@ class GitWrapper(SCMWrapper):
return None
return branch
def _Capture(self, args, cwd=None, **kwargs):
def _Capture(self, args, **kwargs):
kwargs.setdefault('cwd', self.checkout_path)
kwargs.setdefault('stderr', subprocess2.PIPE)
return subprocess2.check_output(['git'] + args, **kwargs).strip()
......
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