Build Tools Cleanup

tools/get_archive.py

 #!/usr/bin/env python
 #
-# Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
+# Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 # Gets or updates a content shell (a nearly headless build of chrome). This is
 # used for running browser tests of client applications.
 
 import json
 import optparse
 import os
 import platform
@@ skipping 75 matching lines @@
   if 'AWS_CREDENTIAL_FILE' in os.environ:
     config_paths.append(os.environ['AWS_CREDENTIAL_FILE'])
   for config_path in config_paths:
     if os.path.exists(config_path):
       return True
 
   return False
 
 
 def InRunhooks():
-  '''True if this script was called by "gclient runhooks" or "gclient sync"'''
+  """True if this script was called by "gclient runhooks" or "gclient sync\""""
   return 'runhooks' in sys.argv
 
 
 def EnsureConfig():
   # If ~/.boto doesn't exist, tell the user to run "gsutil config"
   if not HasBotoConfig():
     print >>sys.stderr, '''
 *******************************************************************************
 * WARNING: Can't download content shell! This is required to test client apps.
 * You need to do a one-time configuration step to access Google Storage.
@@ skipping 15 matching lines @@
     directory: target directory (recreated) to install binary
     version_file: name of file with the current version stamp
     latest_pattern: the google store url pattern pointing to the latest binary
     permanent_prefix: stable google store folder used to download versions
     revision_num: The desired revision number to retrieve. If revision_num is
         None, we return the latest revision. If the revision number is specified
         but unavailable, find the nearest older revision and use that instead.
   """
   osdict = {'Darwin':'mac', 'Linux':'lucid64', 'Windows':'win'}
 
-  def FindPermanentUrl(out, osname, revision_num):
+  def FindPermanentUrl(out, osname, the_revision_num):
     output_lines = out.split()
     latest = output_lines[-1]
-    if not revision_num:
-      revision_num = latest[latest.rindex('-') + 1 : latest.index('.')]
+    if not the_revision_num:
       latest = (permanent_prefix[:permanent_prefix.rindex('/')] % { 'osname' :
           osname, 'bot' : bot } + latest[latest.rindex('/'):])
     else:
-      latest = (permanent_prefix % { 'osname' : osname, 'num1' : revision_num,
-          'num2' : revision_num, 'bot' : bot })
+      latest = (permanent_prefix % { 'osname' : osname, 'num1' : the_revision_num,
+          'num2' : the_revision_num, 'bot' : bot })
       foundURL = False
       while not foundURL:
         # Test to ensure this URL exists because the dartium-archive builds can
         # have unusual numbering (a range of CL numbers) sometimes.
         result, out = Gsutil('ls', permanent_prefix % {'osname' : osname,
-            'num1': revision_num, 'num2': '*', 'bot': bot })
+            'num1': the_revision_num, 'num2': '*', 'bot': bot })
         if result == 0:
           # First try to find one with the the second number the same as the
           # requested number.
           latest = out.split()[0]
           # Now test that the permissions are correct so you can actually
           # download it.
           temp_dir = tempfile.mkdtemp()
           temp_zip = os.path.join(temp_dir, 'foo.zip')
           returncode, out = Gsutil('cp', latest, 'file://' + temp_zip)
           if returncode == 0:
             foundURL = True
           else:
             # Unable to download this item (most likely because something went
             # wrong on the upload and the permissions are bad). Keep looking for
             # a different URL.
-            revision_num = int(revision_num) - 1
+            the_revision_num = int(the_revision_num) - 1
           shutil.rmtree(temp_dir)
         else:
           # Now try to find one with a nearby CL num.
-          revision_num = int(revision_num) - 1
-          if revision_num <= 0:
+          the_revision_num = int(the_revision_num) - 1
+          if the_revision_num <= 0:
             TooEarlyError()
     return latest
 
   GetFromGsutil(name, directory, version_file, latest_pattern, osdict,
                   FindPermanentUrl, revision_num, bot)
 
 
 def GetSdkRevision(name, directory, version_file, latest_pattern,
     permanent_prefix, revision_num):
   """Get a revision of the SDK from the editor build archive.
@@ skipping 169 matching lines @@
     GetDartiumRevision('content_shell', bot, DRT_DIR, DRT_VERSION,
                          DRT_LATEST_PATTERN, DRT_PERMANENT_PATTERN,
                          args.revision)
     CopyDrtFont(DRT_DIR)
   else:
     print ('Please specify the target you wish to download from Google Storage '
         '("drt", "dartium", "chromedriver", or "sdk")')
 
 if __name__ == '__main__':
   sys.exit(main())