Small cosmetic change - simplify retry logic

build/download_utils.py

 #!/usr/bin/python
 # Copyright 2010 The Native Client Authors.  All rights reserved.
 # Use of this source code is governed by a BSD-style license that can
 # be found in the LICENSE file.
 
 """A library to assist automatically downloading files.
 
 This library is used by scripts that download tarballs, zipfiles, etc. as part
 of the build process.
 """
@@ skipping 100 matching lines @@
   return StampMatches(stampfile, url)
 
 
 def WriteSourceStamp(path, url):
   stampfile = os.path.join(path, SOURCE_STAMP)
   WriteStamp(stampfile, url)
 
 
 def Retry(op, *args):
   if sys.platform in ('win32', 'cygwin'):
-    for i in range(5):
+    for i in xrange(5):
+      if i:
+        sys.stdout.write("RETRY: %s %s\n" % (op.__name__, repr(args)))
+        time.sleep(pow(2, i))
       try:
         op(*args)
         break
       except Exception:
-        sys.stdout.write("RETRY: %s %s\n" % (op.__name__, repr(args)))
-        time.sleep(pow(2, i))
+        pass
+    else
+      sys.stdout.write("FAILED: %s %s\n" % (op.__name__, repr(args)))
+      raise
   else:
     op(*args)
 
 
 def MoveDirCleanly(src, dst):
   RemoveDir(dst)
   MoveDir(src, dst)
 
 
 def MoveDir(src, dst):
   Retry(shutil.move, src, dst)
 
 
 def RemoveDir(path):
   if os.path.exists(path):
     Retry(shutil.rmtree, path)
 
 
 def RemoveFile(path):
   if os.path.exists(path):
     Retry(os.unlink, path)