From 120094a81ecc5a761d5b595657b641c8f6a5a7e4 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 26 Feb 2014 22:08:01 +0800
Subject: [PATCH] Only print when got error for some commands.

---
 script/cpplint.py     |  5 +++--
 script/create-dist.py |  4 ++--
 script/lib/util.py    | 12 ++++++++++--
 script/upload.py      |  9 ++++-----
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/script/cpplint.py b/script/cpplint.py
index 4e43b97f4e1f..5acc1bb81ea6 100755
--- a/script/cpplint.py
+++ b/script/cpplint.py
@@ -2,9 +2,10 @@
 
 import fnmatch
 import os
-import subprocess
 import sys
 
+from lib.util import execute
+
 IGNORE_FILES = [
   os.path.join('browser', 'atom_application_mac.h'),
   os.path.join('browser', 'atom_application_delegate_mac.h'),
@@ -44,7 +45,7 @@ def list_files(directories, filters):
 def call_cpplint(files):
   cpplint = os.path.join(SOURCE_ROOT, 'vendor', 'depot_tools', 'cpplint.py')
   rules = '--filter=-build/header_guard,-build/include_what_you_use'
-  subprocess.check_call([sys.executable, cpplint, rules] + files)
+  execute([sys.executable, cpplint, rules] + files)
 
 
 if __name__ == '__main__':
diff --git a/script/create-dist.py b/script/create-dist.py
index 30f0df3aaa59..604cd69d02d9 100755
--- a/script/create-dist.py
+++ b/script/create-dist.py
@@ -9,7 +9,7 @@ import tarfile
 
 from lib.config import LIBCHROMIUMCONTENT_COMMIT, BASE_URL, NODE_VERSION
 from lib.util import scoped_cwd, rm_rf, get_atom_shell_version, make_zip, \
-                     safe_mkdir
+                     safe_mkdir, execute
 
 
 ATOM_SHELL_VRESION = get_atom_shell_version()
@@ -107,7 +107,7 @@ def parse_args():
 
 def force_build():
   build = os.path.join(SOURCE_ROOT, 'script', 'build.py')
-  subprocess.check_call([sys.executable, build, '-c', 'Release'])
+  execute([sys.executable, build, '-c', 'Release'])
 
 
 def copy_binaries():
diff --git a/script/lib/util.py b/script/lib/util.py
index ecbe812162cb..c5194d02bed3 100644
--- a/script/lib/util.py
+++ b/script/lib/util.py
@@ -65,7 +65,7 @@ def extract_tarball(tarball_path, member, destination):
 def extract_zip(zip_path, destination):
   if sys.platform == 'darwin':
     # Use unzip command on Mac to keep symbol links in zip file work.
-    subprocess.check_output(['unzip', zip_path, '-d', destination])
+    execute(['unzip', zip_path, '-d', destination])
   else:
     with zipfile.ZipFile(zip_path) as z:
       z.extractall(destination)
@@ -74,7 +74,7 @@ def make_zip(zip_file_path, files, dirs):
   safe_unlink(zip_file_path)
   if sys.platform == 'darwin':
     files += dirs
-    subprocess.check_output(['zip', '-r', '-y', zip_file_path] + files)
+    execute(['zip', '-r', '-y', zip_file_path] + files)
   else:
     zip_file = zipfile.ZipFile(zip_file_path, "w", zipfile.ZIP_DEFLATED)
     for filename in files:
@@ -110,5 +110,13 @@ def safe_mkdir(path):
       raise
 
 
+def execute(argv):
+  try:
+    subprocess.check_output(argv, stderr=subprocess.STDOUT)
+  except subprocess.CalledProcessError as e:
+    print e.output
+    raise e
+
+
 def get_atom_shell_version():
   return subprocess.check_output(['git', 'describe', '--tags']).strip()
diff --git a/script/upload.py b/script/upload.py
index 8127db522487..15570ce848d6 100755
--- a/script/upload.py
+++ b/script/upload.py
@@ -9,7 +9,7 @@ import sys
 import tempfile
 
 from lib.config import NODE_VERSION
-from lib.util import get_atom_shell_version, scoped_cwd, safe_mkdir
+from lib.util import get_atom_shell_version, scoped_cwd, safe_mkdir, execute
 from lib.github import GitHub
 
 
@@ -36,7 +36,7 @@ def main():
 
   if not dist_newer_than_head():
     create_dist = os.path.join(SOURCE_ROOT, 'script', 'create-dist.py')
-    subprocess.check_output([sys.executable, create_dist])
+    execute([sys.executable, create_dist])
 
   build_version = get_atom_shell_build_version()
   if not ATOM_SHELL_VRESION.startswith(build_version):
@@ -158,8 +158,7 @@ def upload_node(bucket, access_key, secret_key, version):
   if TARGET_PLATFORM == 'win32':
     # Generate the node.lib.
     build = os.path.join(SOURCE_ROOT, 'script', 'build.py')
-    subprocess.check_output([sys.executable, build, '-c', 'Release',
-                             '-t', 'generate_node_lib'])
+    execute([sys.executable, build, '-c', 'Release', '-t', 'generate_node_lib'])
 
     # Upload the 32bit node.lib.
     node_lib = os.path.join(OUT_DIR, 'node.lib')
@@ -203,7 +202,7 @@ def s3put(bucket, access_key, secret_key, prefix, key_prefix, files):
     '--grant', 'public-read'
   ] + files
 
-  subprocess.check_output(args)
+  execute(args)
 
 
 def touch_x64_node_lib():