[NaCl SDK] Use .tar.bz2 for bundle extension instead of .bz2

BUG=none
TEST=none
NOTRY=true

Review URL: https://chromiumcodereview.appspot.com/10690186

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147140 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 20 insertions, 4 deletions

diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py
index 1d2923c..ec21f90 100755
--- a/native_client_sdk/src/build_tools/build_sdk.py
+++ b/native_client_sdk/src/build_tools/build_sdk.py
@@ -534,7 +534,7 @@ def main(args):
   if not skip_examples:
     CopyExamples(pepperdir, toolchains)
 
-  tarname = 'naclsdk_' + platform + '.bz2'
+  tarname = 'naclsdk_' + platform + '.tar.bz2'
   if 'pnacl' in toolchains:
     tarname = 'p' + tarname
   tarfile = os.path.join(OUT_DIR, tarname)
diff --git a/native_client_sdk/src/build_tools/tests/test_update_manifest.py b/native_client_sdk/src/build_tools/tests/test_update_manifest.py
index 9feac9b..5d2525b 100755
--- a/native_client_sdk/src/build_tools/tests/test_update_manifest.py
+++ b/native_client_sdk/src/build_tools/tests/test_update_manifest.py
@@ -36,7 +36,7 @@ CANARY = 'canary'
 
 
 def GetArchiveUrl(host_os, version):
-  basename = 'naclsdk_%s.bz2' % (host_os,)
+  basename = 'naclsdk_%s.tar.bz2' % (host_os,)
   return urlparse.urljoin(HTTPS_BASE_URL, posixpath.join(version, basename))
 
 
@@ -498,6 +498,21 @@ mac,canary,21.0.1156.0,2012-05-30 12:14:21.305090"""
     self._ReadUploadedManifest()
     self._AssertUploadedManifestHasBundle(my_bundle, CANARY)
 
+  def testExtensionWorksAsBz2(self):
+    # Allow old bundles with just .bz2 extension to work
+    self.manifest = MakeManifest(B18_R1_NONE)
+    self.history.Add(OS_MLW, BETA, V18_0_1025_163)
+    bundle = copy.deepcopy(B18_0_1025_163_R1_MLW)
+    archive_url = bundle.GetArchive('mac').url
+    bundle.GetArchive('mac').url = archive_url.replace('.tar', '')
+    self.files.Add(bundle)
+    self._MakeDelegate()
+    self._Run(OS_MLW)
+    self._ReadUploadedManifest()
+    self._AssertUploadedManifestHasBundle(bundle, BETA)
+    self.assertEqual(len(self.uploaded_manifest.GetBundles()), 1)
+
+
 def main():
   suite = unittest.defaultTestLoader.loadTestsFromModule(sys.modules[__name__])
   result = unittest.TextTestRunner(verbosity=2).run(suite)
diff --git a/native_client_sdk/src/build_tools/update_nacl_manifest.py b/native_client_sdk/src/build_tools/update_nacl_manifest.py
index 8147077..1212784 100755
--- a/native_client_sdk/src/build_tools/update_nacl_manifest.py
+++ b/native_client_sdk/src/build_tools/update_nacl_manifest.py
@@ -69,7 +69,7 @@ def GetPlatformFromArchiveUrl(url):
     url: An archive url.
   Returns:
     A platform name (e.g. 'linux')."""
-  match = re.match(r'naclsdk_(.*)\.bz2', posixpath.basename(url))
+  match = re.match(r'naclsdk_(.*?)(?:\.tar)?\.bz2', posixpath.basename(url))
   if not match:
     return None
   return match.group(1)
@@ -429,7 +429,8 @@ class VersionFinder(object):
       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.
-      "gs://nativeclient_mirror/nacl/nacl_sdk/18.0.1025.164/naclsdk_linux.bz2").
+      "gs://nativeclient_mirror/nacl/nacl_sdk/18.0.1025.164/"
+      "naclsdk_linux.tar.bz2").
 
       All returned URLs will use the gs:// schema."""
     files = self.delegate.GsUtil_ls(GS_BUCKET_PATH + version_string)