[NaCl SDK] Fix update issues in sdk_tools.

native_client_sdk/src/build_tools/sdk_tools/command/update.py

 # 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.
 
 import download
 import logging
 import os
 from sdk_update_common import Error
 import sdk_update_common
 import sys
@@ skipping 113 matching lines @@
 
       if tar_file:
         tar_file.Close()
 
     # Remove the archive.
     os.remove(archive_path)
 
 
 def Update(delegate, remote_manifest, local_manifest, bundle_names, force):
   valid_bundles = set([bundle.name for bundle in remote_manifest.GetBundles()])
-  requested_bundles = _GetRequestedBundlesFromArgs(remote_manifest,
-                                                   bundle_names)
+  requested_bundles = _GetRequestedBundleNamesFromArgs(remote_manifest,
+                                                       bundle_names)
   invalid_bundles = requested_bundles - valid_bundles
   if invalid_bundles:
     logging.warn('Ignoring unknown bundle(s): %s' % (
         ', '.join(invalid_bundles)))
     requested_bundles -= invalid_bundles
 
   if SDK_TOOLS in requested_bundles:
     logging.warn('Updating sdk_tools happens automatically. '
                  'Ignoring manual update request.')
     requested_bundles.discard(SDK_TOOLS)
@@ skipping 22 matching lines @@
             % (bundle_name,))
         return
 
       _UpdateBundle(delegate, bundle, local_manifest)
     else:
       print '%s is already up-to-date.' % (bundle.name,)
   else:
     logging.error('Bundle %s does not exist.' % (bundle_name,))
 
 
-def _GetRequestedBundlesFromArgs(remote_manifest, requested_bundles):
+def _GetRequestedBundleNamesFromArgs(remote_manifest, requested_bundles):
   requested_bundles = set(requested_bundles)
   if RECOMMENDED in requested_bundles:
     requested_bundles.discard(RECOMMENDED)
-    requested_bundles |= set(_GetRecommendedBundles(remote_manifest))
+    requested_bundles |= set(_GetRecommendedBundleNames(remote_manifest))
 
   return requested_bundles
 
 
-def _GetRecommendedBundles(remote_manifest):
-  return [bundle for bundle in remote_manifest.GetBundles() if
+def _GetRecommendedBundleNames(remote_manifest):
+  return [bundle.name for bundle in remote_manifest.GetBundles() if
       bundle.recommended]
 
 
 def _BundleNeedsUpdate(delegate, local_manifest, bundle):
   # Always update the bundle if the directory doesn't exist;
   # the user may have deleted it.
   if not delegate.BundleDirectoryExists(bundle.name):
     return True
 
   return local_manifest.BundleNeedsUpdate(bundle)
@@ skipping 11 matching lines @@
   _ValidateArchive(archive, sha1, size)
 
   print 'Updating bundle %s to version %s, revision %s' % (
       bundle.name, bundle.version, bundle.revision)
   extract_dir = bundle.name + '_update'
 
   repath_dir = bundle.get('repath', None)
   if repath_dir:
     # If repath is specified:
     # The files are extracted to nacl_sdk/<bundle.name>_update/<repath>/...
-    # The destination directory is nacl_sdk/<repath>/...
+    # The destination directory is nacl_sdk/<bundle.name>/...
     rename_from_dir = os.path.join(extract_dir, repath_dir)
-    rename_to_dir = repath_dir
   else:
     # If no repath is specified:
     # The files are extracted to nacl_sdk/<bundle.name>_update/...
     # The destination directory is nacl_sdk/<bundle.name>/...
     rename_from_dir = extract_dir
-    rename_to_dir = bundle.name
+
+  rename_to_dir = bundle.name
 
   delegate.ExtractArchive(dest_filename, extract_dir, rename_from_dir,
                           rename_to_dir)
 
   logging.info('Updating local manifest to include bundle %s' % (bundle.name))
   local_manifest.MergeBundle(bundle)
 
 
 def _GetFilenameFromURL(url):
   _, _, path, _, _, _ = urlparse.urlparse(url)
   return path.split('/')[-1]
 
 
 def _ValidateArchive(archive, actual_sha1, actual_size):
   if actual_sha1 != archive.GetChecksum():
     raise Error('SHA1 checksum mismatch on "%s".  Expected %s but got %s' % (
         archive.name, archive.GetChecksum(), actual_sha1))
   if actual_size != archive.size:
     raise Error('Size mismatch on "%s".  Expected %s but got %s bytes' % (
         archive.name, archive.size, actual_size))