Address review comments in r63832.

scm.py

-# Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+# Copyright (c) 2010 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.
 
 """SCM-specific utility classes."""
 
 import cStringIO
 import glob
 import os
 import re
 import shutil
@@ skipping 332 matching lines @@
     # these commands are used in their ordinary forms, the patterns are invalid
     # for "svn status --show-updates", for example.
     pattern = {
           'checkout': update_pattern,
           'status':   status_pattern,
           'update':   update_pattern,
         }[args[0]]
     compiled_pattern = re.compile(pattern)
     # Place an upper limit.
     backoff_time = 5
-    i = 0
+    retries = 0
     while True:
-      i += 1
+      retries += 1
       previous_list_len = len(file_list)
       failure = []
 
       def CaptureMatchingLines(line):
         match = compiled_pattern.search(line)
         if match:
           file_list.append(match.group(1))
         if line.startswith('svn: '):
           failure.append(line)
 
@@ skipping 32 matching lines @@
           else:
             # Progress was made, convert to update since an aborted checkout
             # is now an update.
             args = ['update'] + args[1:]
         else:
           # It was an update or export.
           # We enforce that some progress has been made or a known failure.
           if len(file_list) == previous_list_len and not IsKnownFailure():
             # No known svn error was found and no progress, bail out.
             raise
-        if i == 10:
+        if retries == 10:
           raise
         print "Sleeping %.1f seconds and retrying...." % backoff_time
         time.sleep(backoff_time)
         backoff_time *= 1.3
         continue
       break
 
   @staticmethod
   def CaptureInfo(cwd):
     """Returns a dictionary from the svn info output for the given file.
@@ skipping 401 matching lines @@
     if not SVN.current_version:
       SVN.current_version = SVN.Capture(['--version']).split()[2]
     current_version_list = map(only_int, SVN.current_version.split('.'))
     for min_ver in map(int, min_version.split('.')):
       ver = current_version_list.pop(0)
       if ver < min_ver:
         return (False, SVN.current_version)
       elif ver > min_ver:
         return (True, SVN.current_version)
     return (True, SVN.current_version)