Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(216)

Unified Diff: gclient_scm.py

Issue 232993003: Fix for GitWrapper._Capture (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gclient_scm.py
diff --git a/gclient_scm.py b/gclient_scm.py
index e2a4cd77a28371c5e2e489971add6a4fbbb4d427..0de67bd584134be632ae572d9fd6f2da880c83c9 100644
--- a/gclient_scm.py
+++ b/gclient_scm.py
@@ -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()
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698