[NaCl SDK] Some fixes to update_nacl_manifest.py.

native_client_sdk/src/build_tools/update_nacl_manifest.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.
 
 """Script that reads omahaproxy and gsutil to determine version of SDK to put
 in manifest.
 """
 
 import buildbot_common
@@ skipping 100 matching lines @@
 
     Returns:
       A list where each element is a line from the document, represented as a
       tuple."""
     raise NotImplementedError()
 
   def GsUtil_ls(self, url):
     """Runs gsutil ls |url|
 
     Args:
-      url: The commondatastorage url to list."""
+      url: The commondatastorage url to list.
+    Returns:
+      A list of URLs, all with the gs:// schema."""
     raise NotImplementedError()
 
   def GsUtil_cat(self, url):
     """Runs gsutil cat |url|
 
     Args:
-      url: The commondatastorage url to read from."""
+      url: The commondatastorage url to read from.
+    Returns:
+      A string with the contents of the file at |url|."""
     raise NotImplementedError()
 
   def GsUtil_cp(self, src, dest, stdin=None):
     """Runs gsutil cp |src| |dest|
 
     Args:
       src: The file path or url to copy from.
       dest: The file path or url to copy to.
       stdin: If src is '-', this is used as the stdin to give to gsutil. The
           effect is that text in stdin is copied to |dest|."""
@@ skipping 30 matching lines @@
 
     # filter out empty lines
     return filter(None, stdout.split('\n'))
 
   def GsUtil_cat(self, url):
     """See Delegate.GsUtil_cat"""
     return self._RunGsUtil(None, 'cat', url)
 
   def GsUtil_cp(self, src, dest, stdin=None):
     """See Delegate.GsUtil_cp"""
-    return self._RunGsUtil(stdin, 'cp', '-a', 'public-read', src, dest)
+    # -p ensures we keep permissions when copying "in-the-cloud".
+    return self._RunGsUtil(stdin, 'cp', '-p', '-a', 'public-read', src, dest)
 
   def Print(self, *args):
     sys.stdout.write(' '.join(map(str, args)) + '\n')
 
   def _RunGsUtil(self, stdin, *args):
     """Run gsutil as a subprocess.
 
     Args:
       stdin: If non-None, used as input to the process.
       *args: Arguments to pass to gsutil. The first argument should be an
@@ skipping 109 matching lines @@
         # force increment to next version for all platforms
         shared_version = None
 
   def _GetAvailableNaClSDKArchivesFor(self, version_string):
     """Downloads a list of all available archives for a given version.
 
     Args:
       version_string: The version to find archives for. (e.g. "18.0.1025.164")
     Returns:
       A list of strings, each of which is a platform-specific archive URL. (e.g.
-      "https://commondatastorage.googleapis.com/nativeclient_mirror/nacl/"
-      "nacl_sdk/18.0.1025.164/naclsdk_linux.bz2".
-    """
+      "gs://nativeclient_mirror/nacl/nacl_sdk/18.0.1025.164/naclsdk_linux.bz2").
+
+      All returned URLs will use the gs:// schema."""
     files = self.delegate.GsUtil_ls(GS_BUCKET_PATH + version_string)
+    assert all(file.startswith('gs://') for file in files)
+
     archives = [file for file in files if not file.endswith('.json')]
     manifests = [file for file in files if file.endswith('.json')]
 
     # don't include any archives that don't have an associated manifest.
     return filter(lambda a: a + '.json' in manifests, archives)
 
 
 class Updater(object):
   def __init__(self, delegate):
     self.delegate = delegate
@@ skipping 26 matching lines @@
       bundle.recommended = bundle_recommended
       manifest.MergeBundle(bundle)
     self._UploadManifest(manifest)
     self.delegate.Print('Done.')
 
   def _GetPlatformArchiveBundle(self, archive):
     """Downloads the manifest "snippet" for an archive, and reads it as a
        Bundle.
 
     Args:
-      archive: The URL of a platform-specific archive.
+      archive: A full URL of a platform-specific archive, using the gs schema.
     Returns:
       An object of type manifest_util.Bundle, read from a JSON file storing
       metadata for this archive.
     """
-    stdout = self.delegate.GsUtil_cat(GS_BUCKET_PATH + archive + '.json')
+    stdout = self.delegate.GsUtil_cat(archive + '.json')
     bundle = manifest_util.Bundle('')
     bundle.LoadDataFromString(stdout)
+    # Some snippets were uploaded with revisions and versions as strings. Fix
+    # those here.
+    bundle.revision = int(bundle.revision)
+    bundle.version = int(bundle.version)
     return bundle
 
   def _UploadManifest(self, manifest):
     """Upload a serialized manifest_util.SDKManifest object.
 
     Upload one copy to gs://<BUCKET_PATH>/naclsdk_manifest2.json, and a copy to
     gs://<BUCKET_PATH>/manifest_backups/naclsdk_manifest2.<TIMESTAMP>.json.
 
     Args:
       manifest: The new manifest to upload.
@@ skipping 34 matching lines @@
   updater.Update(manifest)
 
 
 def main(args):
   delegate = RealDelegate()
   Run(delegate, ('mac', 'win', 'linux'))
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))