Update NaCl SDK to push MouseLock fix.

native_client_sdk/src/build_tools/sdk_tools/sdk_update.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 '''A simple tool to update the Native Client SDK to the latest version'''
 
 import cStringIO
+import cygtar
 import errno
 import exceptions
 import hashlib
 import json
 import optparse
 import os
 import shutil
 import subprocess
 import sys
-import tarfile
 import tempfile
 import time
 import urllib2
 import urlparse
 
 
 #------------------------------------------------------------------------------
 # Constants
 
 # Bump the MINOR_REV every time you check this file in.
-MAJOR_REV = 1
-MINOR_REV = 14
+MAJOR_REV = 2
+MINOR_REV = 16
 
 GLOBAL_HELP = '''Usage: naclsdk [options] command [command_options]
 
 naclsdk is a simple utility that updates the Native Client (NaCl)
 Software Developer's Kit (SDK).  Each component is kept as a 'bundle' that
 this utility can download as as subdirectory into the SDK.
 
 Commands:
   help [command] - Get either general or command-specific help
   list - Lists the available bundles
   update/install - Updates/installs bundles in the SDK
 
 Example Usage:
   naclsdk list
   naclsdk update --force pepper_17
   naclsdk install recommended
   naclsdk help update'''
 
-MANIFEST_FILENAME='naclsdk_manifest.json'
+MANIFEST_FILENAME='naclsdk_manifest2.json'
 SDK_TOOLS='sdk_tools'  # the name for this tools directory
 USER_DATA_DIR='sdk_cache'
 
 HTTP_CONTENT_LENGTH = 'Content-Length'  # HTTP Header field for content length
 
 # The following SSL certificates are used to validate the SSL connection
 # to https://commondatastorage.googleapis.com
 # TODO(mball): Validate at least one of these certificates.
 # http://stackoverflow.com/questions/1087227/validate-ssl-certificates-with-python
 
@@ skipping 72 matching lines @@
 STABILITY_LITERALS = [
     'obsolete', 'post_stable', 'stable', 'beta', 'dev', 'canary']
 # Valid values for the archive.host_os field
 HOST_OS_LITERALS = frozenset(['mac', 'win', 'linux', 'all'])
 # Valid values for bundle-recommended field.
 YES_NO_LITERALS = ['yes', 'no']
 # Valid keys for various sdk objects, used for validation.
 VALID_ARCHIVE_KEYS = frozenset(['host_os', 'size', 'checksum', 'url'])
 VALID_BUNDLES_KEYS = frozenset([
     ARCHIVES_KEY, NAME_KEY, VERSION_KEY, REVISION_KEY,
-    'description', 'desc_url', 'stability', 'recommended',
+    'description', 'desc_url', 'stability', 'recommended', 'repath',
     ])
 VALID_MANIFEST_KEYS = frozenset(['manifest_version', BUNDLES_KEY])
 
 
 #------------------------------------------------------------------------------
 # General Utilities
 
 
 _debug_mode = False
 _quiet_mode = False
@@ skipping 63 matching lines @@
   RemoveDir(outdir)
 
   if os.path.splitext(installer)[1] == '.exe':
     # If the installer has extension 'exe', assume it's a Windows NSIS-style
     # installer that handles silent (/S) and relocated (/D) installs.
     command = [installer, '/S', '/D=%s' % outdir]
     subprocess.check_call(command)
   else:
     os.mkdir(outdir)
     tar_file = None
+    curpath = os.getcwd()
     try:
-      tar_file = tarfile.open(installer)
-      tar_file.extractall(path=outdir)
+      tar_file = cygtar.CygTar(installer, 'r', verbose=True)
+      if outdir: os.chdir(outdir)
+      tar_file.Extract()
     finally:
       if tar_file:
-        tar_file.close()
+        tar_file.Close()
+      os.chdir(curpath)
 
 
 def RemoveDir(outdir):
   '''Removes the given directory
 
   On Unix systems, this just runs shutil.rmtree, but on Windows, this doesn't
   work when the directory contains junctions (as does our SDK installer).
   Therefore, on Windows, it runs rmdir /S /Q as a shell command.  This always
   does the right thing on Windows. If the directory already didn't exist,
   RemoveDir will return successfully without taking any action.
 
   Args:
     outdir: The directory to delete
 
   Raises:
     CalledProcessError - if the delete operation fails on Windows
     OSError - if the delete operation fails on Linux
   '''
 
   DebugPrint('Removing %s' % outdir)
   try:
-    if sys.platform == 'win32':
-      subprocess.check_call(['rmdir /S /Q', outdir], shell=True)
-    else:
-      shutil.rmtree(outdir)
+    shutil.rmtree(outdir)
   except:
-    # If the directory is gone anyway, we probably failed because it was
-    # already gone. Treat that as success.
     if not os.path.exists(outdir):
       return
-    # Otherwise, re-raise.
-    raise
+    # On Windows this could be an issue with junctions, so try again with rmdir
+    if sys.platform == 'win32':
+      subprocess.check_call(['rmdir', '/S', '/Q', outdir], shell=True)
 
 
 def RenameDir(srcdir, destdir):
   '''Renames srcdir to destdir. Removes destdir before doing the
      rename if it already exists.'''
 
-  max_tries = 100
-
+  max_tries = 5
   for num_tries in xrange(max_tries):
     try:
       RemoveDir(destdir)
       os.rename(srcdir, destdir)
       return
     except OSError as err:
       if err.errno != errno.EACCES:
         raise err
       # If we are here, we didn't exit due to raised exception, so we are
       # handling a Windows flaky access error.  Sleep one second and try
       # again.
-      time.sleep(1)
+      time.sleep(num_tries + 1)
   # end of while loop -- could not RenameDir
   raise Error('Could not RenameDir %s => %s after %d tries.\n' %
               'Please check that no shells or applications '
               'are accessing files in %s.'
               % (srcdir, destdir, num_tries, destdir))
 
 
 def ShowProgress(progress):
   ''' A download-progress function used by class Archive.
       (See DownloadAndComputeHash).'''
@@ skipping 313 matching lines @@
 
 
 class SDKManifest(object):
   '''This class contains utilities for manipulation an SDK manifest string
 
   For ease of unit-testing, this class should not contain any file I/O.
   '''
 
   def __init__(self):
     '''Create a new SDKManifest object with default contents'''
-    self.MANIFEST_VERSION = 1
+    self.MANIFEST_VERSION = MAJOR_REV
     self._manifest_data = {
         "manifest_version": self.MANIFEST_VERSION,
         "bundles": [],
         }
 
   def _ValidateManifest(self):
     '''Validate the Manifest file and raises an exception for problems'''
     # Validate the manifest top level
     if self._manifest_data["manifest_version"] > self.MANIFEST_VERSION:
       raise Error("Manifest version too high: %s" %
@@ skipping 286 matching lines @@
       if sha1 != archive['checksum']['sha1']:
         raise Error("SHA1 checksum mismatch on '%s'.  Expected %s but got %s" %
                     (bundle_name, archive['checksum']['sha1'], sha1))
       if size != archive['size']:
         raise Error("Size mismatch on Archive.  Expected %s but got %s bytes" %
                     (archive['size'], size))
       InfoPrint('Updating bundle %s to version %s, revision %s' % (
                 (bundle_name, bundle[VERSION_KEY], bundle[REVISION_KEY])))
       ExtractInstaller(dest_filename, bundle_update_path)
       if bundle_name != SDK_TOOLS:
-        RenameDir(bundle_update_path, bundle_path)
+        repath = bundle.get('repath', None)
+        if repath:
+          bundle_move_path = os.path.join(bundle_update_path, repath)
+        else:
+          bundle_move_path = bundle_update_path
+        RenameDir(bundle_move_path, bundle_path)
+        if os.path.exists(bundle_update_path):
+          RemoveDir(bundle_update_path)
       os.remove(dest_filename)
       local_manifest.MergeBundle(bundle)
       local_manifest.WriteFile()
     # Test revision numbers, update the bundle accordingly.
     # TODO(dspringer): The local file should be refreshed from disk each
     # iteration thought this loop so that multiple sdk_updates can run at the
     # same time.
     if local_manifest.BundleNeedsUpdate(bundle):
       if (not update_options.force and os.path.exists(bundle_path) and
           bundle_name != SDK_TOOLS):
@@ skipping 114 matching lines @@
 
   return 0  # Success
 
 
 if __name__ == '__main__':
   try:
     sys.exit(main(sys.argv[1:]))
   except Error as error:
     print "Error: %s" % error
     sys.exit(1)