Merged in other half of NaCl SDK's r1387 change to update_manifest.py

native_client_sdk/src/build_tools/sdk_tools/sdk_update.py

 #!/usr/bin/env python
 # Copyright (c) 2011 The Native Client 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 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 = 12
+MINOR_REV = 13
 
 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
@@ skipping 428 matching lines @@
 
   def Update(self, url):
     ''' Update the archive with the new url. Automatically update the
         archive's size and checksum fields. Raises an Error if the url is
         is invalid. '''
     self['url'] = url
     sha1, size = self.ComputeSha1AndSize()
     self['size'] = size
     self['checksum'] = {'sha1': sha1}
 
+  def GetUrl(self):
+    '''Returns the URL of this Archive'''
+    return self['url']
+
+  def GetSize(self):
+    '''Returns the size of this archive, in bytes'''
+    return int(self['size'])
+
+  def GetChecksum(self, type='sha1'):
+    '''Returns a given cryptographic checksum of the archive'''
+    return self['checksum'][type]
+
 
 class Bundle(dict):
   ''' A placeholder for sdk bundle information. We derive Bundle from
       dict so that it is easily serializable.'''
   def __init__(self, obj):
     ''' Create a new bundle with the given bundle name.'''
     if isinstance(obj, str) or isinstance(obj, unicode):
       dict.__init__(self, [(ARCHIVES_KEY, []), (NAME_KEY, obj)])
     else:
       dict.__init__(self, obj)
@@ skipping 86 matching lines @@
 
     Args:
       host_os: name of host os whose archive must be updated or created.
       url: the new url for the archive.'''
     archive = self.GetArchive(host_os)
     if not archive:
       archive = Archive(host_os_name=host_os)
       self[ARCHIVES_KEY].append(archive)
     archive.Update(url)
 
+  def GetArchives(self):
+    '''Returns all the archives in this bundle'''
+    return self[ARCHIVES_KEY]
+
 
 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
@@ skipping 431 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)