Now that CheckCallAndFilter() throws subprocess2.CalledProcessError, use e.returncode.

gclient_scm.py

 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Gclient-specific SCM-specific operations."""
 
 import logging
 import os
 import posixpath
 import re
@@ skipping 488 matching lines @@
     # If the parent directory does not exist, Git clone on Windows will not
     # create it, so we need to do it manually.
     parent_dir = os.path.dirname(self.checkout_path)
     if not os.path.exists(parent_dir):
       os.makedirs(parent_dir)
 
     for _ in range(3):
       try:
         self._Run(clone_cmd, options, cwd=self._root_dir)
         break
-      except (gclient_utils.Error, subprocess2.CalledProcessError), e:
-        # TODO(maruel): Hackish, should be fixed by moving _Run() to
-        # subprocess2.check_output().
-        # Too bad we don't have access to the actual output.
+      except subprocess2.CalledProcessError, e:
+        # Too bad we don't have access to the actual output yet.
         # We should check for "transfer closed with NNN bytes remaining to
         # read". In the meantime, just make sure .git exists.
-        if (e.args[0] == 'git command clone returned 128' and
+        if (e.returncode == 128 and
             os.path.exists(os.path.join(self.checkout_path, '.git'))):
           print(str(e))
           print('Retrying...')
           continue
         raise e
 
     if detach_head:
       # Squelch git's very verbose detached HEAD warning and use our own
       self._Capture(['checkout', '--quiet', '%s' % revision])
       print(
@@ skipping 414 matching lines @@
 
     This method returns a new list to be used as a command."""
     new_command = command[:]
     if revision:
       new_command.extend(['--revision', str(revision).strip()])
     # --force was added to 'svn update' in svn 1.5.
     if ((options.force or options.manually_grab_svn_rev) and
         scm.SVN.AssertVersion("1.5")[0]):
       new_command.append('--force')
     return new_command