commit 240196d751904c4ca89f26730f89404018cc79b7
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Jan 16 19:48:19 2014 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Jan 16 19:48:19 2014 +0000
tree 3ee9c8724d34bd2f011677e8ff512494e8370943
parent cc190eb6f321d0255ca035dc1ceef53af3900f4a

Make tools/submit_try safer

Using proc.wait() in combination with PIPE doesn't seem
to be safe for large patches according to
http://docs.python.org/2/library/subprocess.html.

Moving to proc.communicate().

Signed-off-by: Kévin PETIT <kevin.petit@arm.com>

BUG=skia:
R=djsollen@google.com, borenet@google.com

Author: kevin.petit.arm@gmail.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13113 2bbb7eff-a529-9590-31e7-b0007b416f81

tools/submit_try

diff --git a/tools/submit_try b/tools/submit_try
index e371afb..6647b89 100755
--- a/tools/submit_try
+++ b/tools/submit_try
@@ -286,15 +286,17 @@
     cmd = [GIT, 'diff', git_cl.Changelist().GetUpstreamBranch(),
            '--no-ext-diff']
     proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    if proc.wait() != 0:
+    git_data = proc.communicate()
+    if git_data[0] is None:
       raise Exception('Failed to capture git diff!')
 
     temp_dir = tempfile.mkdtemp()
     try:
       diff_file = os.path.join(temp_dir, 'patch.diff')
       with open(diff_file, 'wb') as f:
-        f.write(proc.communicate()[0])
-  
+        f.write(git_data[0])
+        f.close()
+
       try_args = ['--use_svn',
                   '--svn_repo', GetTryRepo(),
                   '--root', GetCheckoutRoot(is_svn),