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

Unified Diff: checkout.py

Issue 7860041: Update subprocess2.check_output() to behave like subprocess.check_output(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: update comment and docstring, they were unclear Created 9 years, 3 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 | « PRESUBMIT.py ('k') | gclient_scm.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: checkout.py
diff --git a/checkout.py b/checkout.py
index a8fdcd2fce8c567ea96d46003302010d92e91b54..5f61d6f16598e0533e4fb37983c9551a6d9f377d 100644
--- a/checkout.py
+++ b/checkout.py
@@ -140,6 +140,7 @@ class RawCheckout(CheckoutBase):
stdout = subprocess2.check_output(
['patch', '-p%s' % p.patchlevel],
stdin=p.get(),
+ stderr=subprocess2.STDOUT,
cwd=self.project_path)
elif p.is_new and not os.path.exists(filepath):
# There is only a header. Just create the file.
@@ -218,7 +219,9 @@ class SvnMixIn(object):
"""
kwargs.setdefault('cwd', self.project_path)
return subprocess2.check_output(
- self._add_svn_flags(args, True, credentials), **kwargs)
+ self._add_svn_flags(args, True, credentials),
+ stderr=subprocess2.STDOUT,
+ **kwargs)
@staticmethod
def _parse_svn_info(output, key):
@@ -496,7 +499,8 @@ class GitCheckoutBase(CheckoutBase):
def _check_output_git(self, args, **kwargs):
kwargs.setdefault('cwd', self.project_path)
- return subprocess2.check_output(['git'] + args, **kwargs)
+ return subprocess2.check_output(
+ ['git'] + args, stderr=subprocess2.STDOUT, **kwargs)
def _branches(self):
"""Returns the list of branches and the active one."""
« no previous file with comments | « PRESUBMIT.py ('k') | gclient_scm.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698