From d4993a7311ac43c77fb3bedeed5b6567ee6c2f84 Mon Sep 17 00:00:00 2001
From: David James <davidjames@google.com>
Date: Tue, 16 Nov 2010 15:47:25 -0800
Subject: [PATCH] Don't use output argument for CalledProcessError (Python 2.7
 only)

Also add _Print statement so that stdout is printed.

BUG=chromium-os:9257
TEST=Run cros_mark_as_stable.py clean / commit

Change-Id: I9a01d6369d4b14ca0be812b8b1509c8375b1d575

Review URL: http://codereview.chromium.org/5063004
---
 cros_mark_as_stable.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cros_mark_as_stable.py b/cros_mark_as_stable.py
index b2f2cd4067..5df6a83fef 100755
--- a/cros_mark_as_stable.py
+++ b/cros_mark_as_stable.py
@@ -248,7 +248,8 @@ def _SimpleRunCommand(command):
   stdout = proc_handle.communicate()[0]
   retcode = proc_handle.wait()
   if retcode != 0:
-    raise subprocess.CalledProcessError(retcode, command, output=stdout)
+    _Print(stdout)
+    raise subprocess.CalledProcessError(retcode, command)
   return stdout