Standardize automatic retry and add a 15 seconds sleep to increase the chances of success

gclient_scm.py

 # Copyright (c) 2009 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
 import subprocess
+import time
 
 import scm
 import gclient_utils
 
 
 class DiffFilterer(object):
   """Simple class which tracks which file is being diffed and
   replaces instances of its file name in the original and
   working copy lines of the svn/git diff output."""
   index_string = "Index: "
@@ skipping 223 matching lines @@
     if not upstream_branch or not upstream_branch.startswith('refs/remotes'):
       current_type = "hash"
       logging.debug("Current branch is based off a specific rev and is not "
                     "tracking an upstream.")
     elif upstream_branch.startswith('refs/remotes'):
       current_type = "branch"
     else:
       raise gclient_utils.Error('Invalid Upstream')
 
     # Update the remotes first so we have all the refs.
-    for _ in range(3):
+    for _ in range(10):
       try:
         remote_output, remote_err = scm.GIT.Capture(
             ['remote'] + verbose + ['update'],
             self.checkout_path,
             print_error=False)
         break
-      except gclient_utils.CheckCallError, e:
+      except gclient_utils.CheckCallError:
         # Hackish but at that point, git is known to work so just checking for
         # 502 in stderr should be fine.
         if '502' in e.stderr:
           print str(e)
-          print "Retrying..."
+          print "Sleeping 15 seconds and retrying..."
+          time.sleep(15)
           continue
-        raise e
+        raise
 
     if verbose:
       print remote_output.strip()
       # git remote update prints to stderr when used with --verbose
       print remote_err.strip()
 
     # This is a big hammer, debatable if it should even be here...
     if options.force or options.reset:
       self._Run(['reset', '--hard', 'HEAD'], redirect_stdout=False)
 
@@ skipping 570 matching lines @@
       print("\n________ couldn't run \'%s\' in \'%s\':\nThe directory "
             "does not exist."
             % (' '.join(command), path))
       # There's no file list to retrieve.
     else:
       scm.SVN.RunAndGetFileList(options, command, path, file_list)
 
   def FullUrlForRelativeUrl(self, url):
     # Find the forth '/' and strip from there. A bit hackish.
     return '/'.join(self.url.split('/')[:4]) + url