| Index: gclient_scm.py
|
| diff --git a/gclient_scm.py b/gclient_scm.py
|
| index 5e64afcedd8cf25a0ea4c89ab8cb4b34510ab56d..15e9eb9b2a57aeedeefb7fc3a81e105ac2906a73 100644
|
| --- a/gclient_scm.py
|
| +++ b/gclient_scm.py
|
| @@ -506,13 +506,11 @@ class GitWrapper(SCMWrapper):
|
| 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...')
|
|
|