update_nacl_manifest improvements

native_client_sdk/src/build_tools/nacl-mono-buildbot.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.
 
 import hashlib
 import json
 import os
 import sys
 
 import buildbot_common
 import build_utils
 
 GS_MANIFEST_PATH = 'gs://nativeclient-mirror/nacl/nacl_sdk/'
 SDK_MANIFEST = 'naclsdk_manifest2.json'
-MONO_MANIFEST = 'naclmono_manifest.json' 
+MONO_MANIFEST = 'naclmono_manifest.json'
 
 def build_and_upload_mono(sdk_revision, pepper_revision, sdk_url,
                           upload_path, args):
   install_dir = 'naclmono'
   buildbot_common.RemoveDir(install_dir)
 
   revision_opt = ['--sdk-revision', sdk_revision] if sdk_revision else []
   url_opt = ['--sdk-url', sdk_url] if sdk_url else []
 
   buildbot_common.Run([sys.executable, 'nacl-mono-builder.py',
@@ skipping 35 matching lines @@
         newdict['stability'] = b['stability']
         newdict['naclmono_name'] = 'naclmono_' + newdict['pepper_revision']
         pepper_infos.append(newdict)
 
   # Get a copy of the naclmono manifest file
   buildbot_common.Run([buildbot_common.GetGsutil(), 'cp',
       GS_MANIFEST_PATH + MONO_MANIFEST, '.'])
   manifest_file = open(MONO_MANIFEST, 'r')
   mono_manifest = json.loads(manifest_file.read())
   manifest_file.close()
-  
+
   ret = []
   mono_manifest_dirty = False
   # Check to see if we need to rebuild mono based on sdk revision
   for key, value in mono_manifest.items():
     if key == 'bundles':
       for info in pepper_infos:
         bundle = filter(lambda b: b['name'] == info['naclmono_name'], value)
         if len(bundle) == 0:
           info['naclmono_rev'] = '1'
           ret.append(info)
@@ skipping 55 matching lines @@
     # Insert this new bundle into the manifest,
     # probably overwriting an existing bundle.
     for key, value in mono_manifest.items():
       if key == 'bundles':
         existing = filter(lambda b: b['name'] == info['naclmono_name'], value)
         if len(existing) > 0:
           loc = value.index(existing[0])
           value[loc] = bundle
         else:
           value.append(bundle)
-    
+
   # Write out the file locally, then upload to its known location.
   manifest_file = open(MONO_MANIFEST, 'w')
   manifest_file.write(json.dumps(mono_manifest, sort_keys=False, indent=2))
   manifest_file.close()
   buildbot_common.Run([buildbot_common.GetGsutil(), 'cp', '-a', 'public-read',
       MONO_MANIFEST, GS_MANIFEST_PATH + MONO_MANIFEST])
-  
+
 
 def main(args):
   args = args[1:]
 
   buildbot_revision = os.environ.get('BUILDBOT_REVISION', '')
   buildername = os.environ.get('BUILDBOT_BUILDERNAME', '')
 
   os.chdir(buildbot_common.SCRIPT_DIR)
 
   if buildername == 'linux-sdk-mono32':
     assert buildbot_revision
     sdk_revision = buildbot_revision.split(':')[0]
     pepper_revision = build_utils.ChromeMajorVersion()
     build_and_upload_mono(sdk_revision, pepper_revision, None,
                           'trunk.' + sdk_revision, args)
   elif buildername == 'linux-sdk-mono64':
     infos = get_sdk_build_info()
     for info in infos:
       # This will put the file in naclmono_19/1/naclmono_19.bz2 for example.
       upload_path = info['naclmono_name'] + '/' + info['naclmono_rev']
       build_and_upload_mono(None, info['pepper_revision'], info['sdk_url'],
           upload_path, args)
     update_mono_sdk_json(infos)
-    
+
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))